Index: disks.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/disks.c,v retrieving revision 1.128 diff -u -r1.128 disks.c --- disks.c 2001/04/18 20:26:28 1.128 +++ disks.c 2001/08/22 19:05:05 @@ -115,7 +115,7 @@ mvaddstr(0, 0, "Disk name:\t"); clrtobot(); attrset(A_REVERSE); addstr(d->name); attrset(A_NORMAL); - attrset(A_REVERSE); mvaddstr(0, 55, "FDISK Partition Editor"); attrset(A_NORMAL); + attrset(A_REVERSE); mvaddstr(0, 55, "FDISK Slice Editor"); attrset(A_NORMAL); mvprintw(1, 0, "DISK Geometry:\t%lu cyls/%lu heads/%lu sectors = %lu sectors (%luMB)", d->bios_cyl, d->bios_hd, d->bios_sect, @@ -372,7 +372,7 @@ else if (toupper(key) == 'A') rv = 0; else { - rv = msgYesNo("Do you want to do this with a true partition entry\n" + rv = msgYesNo("Do you want to do this with a true slice entry\n" "so as to remain cooperative with any future possible\n" "operating systems on the drive(s)?\n" "(See also the section about ``dangerously dedicated''\n" @@ -422,14 +422,14 @@ record_chunks(d); #else sprintf(tmp, "%d", SUBTYPE_FREEBSD); - val = msgGetInput(tmp, "Enter type of partition to create:\n\n" + val = msgGetInput(tmp, "Enter type of slice to create:\n\n" "Pressing Enter will choose the default, a native FreeBSD\n" "slice (type 165). You can choose other types, 6 for a\n" - "DOS partition or 131 for a Linux partition, for example.\n\n" - "Note: If you choose a non-FreeBSD partition type, it will not\n" + "DOS slice or 131 for a Linux slice, for example.\n\n" + "Note: If you choose a non-FreeBSD slice type, it will not\n" "be formatted or otherwise prepared, it will simply reserve space\n" "for you to use another tool, such as DOS FORMAT, to later format\n" - "and use the partition."); + "and use the slice."); if (val && (subtype = strtol(val, NULL, 0)) > 0) { if (subtype == SUBTYPE_FREEBSD) partitiontype = freebsd; @@ -474,24 +474,24 @@ sprintf(tmp, "%d", SUBTYPE_FREEBSD); #ifdef PC98 - val = msgGetInput(tmp, "New partition type:\n\n" + val = msgGetInput(tmp, "New slice type:\n\n" "Pressing Enter will choose the default, a native FreeBSD\n" "slice (type 50324). Other popular values are 37218 for\n" - "DOS FAT partition.\n\n" - "Note: If you choose a non-FreeBSD partition type, it will not\n" + "DOS FAT slice.\n\n" + "Note: If you choose a non-FreeBSD slice type, it will not\n" "be formatted or otherwise prepared, it will simply reserve space\n" "for you to use another tool, such as DOS format, to later format\n" - "and actually use the partition."); + "and actually use the slice."); #else - val = msgGetInput(tmp, "New partition type:\n\n" + val = msgGetInput(tmp, "New slice type:\n\n" "Pressing Enter will choose the default, a native FreeBSD\n" "slice (type 165). Other popular values are 6 for\n" - "DOS FAT partition, 131 for a Linux ext2fs partition or\n" - "130 for a Linux swap partition.\n\n" - "Note: If you choose a non-FreeBSD partition type, it will not\n" + "DOS FAT slice, 131 for a Linux ext2fs slice or\n" + "130 for a Linux swap slice.\n\n" + "Note: If you choose a non-FreeBSD slice type, it will not\n" "be formatted or otherwise prepared, it will simply reserve space\n" "for you to use another tool, such as DOS format, to later format\n" - "and actually use the partition."); + "and actually use the slice."); #endif /* PC98 */ if (val && (subtype = strtol(val, NULL, 0)) > 0) { if (subtype == SUBTYPE_FREEBSD) @@ -594,9 +594,9 @@ #endif if (DITEM_STATUS(diskPartitionWrite(NULL)) != DITEM_SUCCESS) - msgConfirm("Disk partition write returned an error status!"); + msgConfirm("Disk slice write returned an error status!"); else - msgConfirm("Wrote FDISK partition information out successfully."); + msgConfirm("Wrote FDISK slice information out successfully."); } clear(); break; @@ -823,7 +823,7 @@ Set_Boot_Blocks(d, boot1, boot2); #endif - msgNotify("Writing partition information to drive %s", d->name); + msgNotify("Writing slice information to drive %s", d->name); if (!Fake && Write_Disk(d)) { msgConfirm("ERROR: Unable to write data to disk %s!", d->name); return DITEM_FAILURE; @@ -931,7 +931,7 @@ break; } if (!chunk_info[i]) { - msgConfirm("Unable to find any existing FreeBSD partitions on this disk!"); + msgConfirm("Unable to find any existing FreeBSD slices on this disk!"); return; } } Index: dos.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/dos.c,v retrieving revision 1.25 diff -u -r1.25 dos.c --- dos.c 2001/06/01 12:16:08 1.25 +++ dos.c 2001/08/22 19:07:41 @@ -86,7 +86,7 @@ if (!DOSMounted) return; if (unmount(mountpoint, MNT_FORCE) != 0) - msgConfirm("Could not unmount the DOS partition from %s: %s", + msgConfirm("Could not unmount the DOS slice from %s: %s", mountpoint, strerror(errno)); else DOSMounted = FALSE; Index: install.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/install.c,v retrieving revision 1.302 diff -u -r1.302 install.c --- install.c 2001/08/15 19:39:11 1.302 +++ install.c 2001/08/22 19:09:24 @@ -501,12 +501,12 @@ variable_set2(SYSTEM_STATE, "standard", 0); dialog_clear_norefresh(); #ifndef __alpha__ - msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") partitioning\n" + msgConfirm("In the next menu, you will need to set up a DOS-style (\"fdisk\") slice\n" "scheme for your hard disk. If you simply wish to devote all disk space\n" "to FreeBSD (overwriting anything else that might be on the disk(s) selected)\n" - "then use the (A)ll command to select the default partitioning scheme followed\n" + "then use the (A)ll command to select the default slicing scheme followed\n" "by a (Q)uit. If you wish to allocate only free space to FreeBSD, move to a\n" - "partition marked \"unused\" and use the (C)reate command."); + "slice marked \"unused\" and use the (C)reate command."); nodisks: if (DITEM_STATUS(diskPartitionEditor(self)) == DITEM_FAILURE) @@ -528,7 +528,7 @@ "care for the layout chosen by (A)uto, press F1 for more information on\n" "manual layout."); #else - msgConfirm("Now you need to create BSD partitions inside of the fdisk partition(s)\n" + msgConfirm("Now you need to create BSD partitions inside of the fdisk slice(s)\n" "just created. If you have a reasonable amount of disk space (200MB or more)\n" "and don't have any special requirements, simply use the (A)uto command to\n" "allocate space automatically. If you have more specific needs or just don't\n" Index: label.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/label.c,v retrieving revision 1.110 diff -u -r1.110 label.c --- label.c 2001/07/13 16:45:00 1.110 +++ label.c 2001/08/22 19:12:09 @@ -525,7 +525,7 @@ pslice_focus_found = -1; mvprintw(srow++, 0, - "Disk: %s\tPartition name: %s\tFree: %d blocks (%dMB)", + "Disk: %s\tSlice name: %s\tFree: %d blocks (%dMB)", label_chunk_info[i].c->disk->name, label_chunk_info[i].c->name, sz, (sz / ONE_MEG)); attrset(A_NORMAL); @@ -1022,7 +1022,7 @@ break; } else if (label_chunk_info[here].type == PART_FAT) { - msg = "Use the Disk Partition Editor to delete DOS partitions"; + msg = "Use the Disk Slice Editor to delete DOS slices"; break; } Delete_Chunk(label_chunk_info[here].c->disk, label_chunk_info[here].c); Index: media.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/media.c,v retrieving revision 1.116 diff -u -r1.116 media.c --- media.c 2001/07/30 20:45:54 1.116 +++ media.c 2001/08/22 19:12:27 @@ -231,7 +231,7 @@ devs = deviceFind(NULL, DEVICE_TYPE_DOS); cnt = deviceCount(devs); if (!cnt) { - msgConfirm("No DOS primary partitions found! This installation method is unavailable"); + msgConfirm("No DOS primary slices found! This installation method is unavailable"); return DITEM_FAILURE | DITEM_CONTINUE; } else if (cnt > 1) { Index: menus.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v retrieving revision 1.316 diff -u -r1.316 menus.c --- menus.c 2001/08/12 23:40:04 1.316 +++ menus.c 2001/08/22 19:15:12 @@ -229,7 +229,7 @@ { " Dump Vars", "(debugging) dump out internal variables.", NULL, dump_variables }, { " Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, #ifdef __i386__ - { " Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, + { " Fdisk", "The disk Slice editor", NULL, diskPartitionEditor }, #endif { " Fixit", "Repair mode with CDROM or fixit floppy.", NULL, dmenuSubmenu, NULL, &MenuFixit }, { " FTP sites", "The FTP mirror site listing.", NULL, dmenuSubmenu, NULL, &MenuMediaFTP }, @@ -1169,16 +1169,16 @@ { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, { "2 Options", "View/Set various installation options", NULL, optionsEditor }, #ifdef __alpha__ - { "3 Label", "Label disk partitions", NULL, diskLabelEditor }, + { "3 Label", "Label disk slices", NULL, diskLabelEditor }, { "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions }, { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia }, - { "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit }, + { "6 Commit", "Perform any pending Slice/Partition/Extract actions", NULL, installCustomCommit }, #else - { "3 Partition", "Allocate disk space for FreeBSD", NULL, diskPartitionEditor }, - { "4 Label", "Label allocated disk partitions", NULL, diskLabelEditor }, + { "3 Slice", "Allocate disk space for FreeBSD", NULL, diskPartitionEditor }, + { "4 Partition", "Subdivide slices in to partitions", NULL, diskLabelEditor }, { "5 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions }, { "6 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia }, - { "7 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit }, + { "7 Commit", "Perform any pending Slice/Partition/Extract actions", NULL, installCustomCommit }, #endif { NULL } }, };