added fstype to hard drive installs

8 files changed, 374 insertions, 304 deletions

diff --git a/anaconda b/anaconda
index 343e8ff8e..d2b54f20d 100755
--- a/anaconda
+++ b/anaconda
@@ -139,10 +139,14 @@ elif (method[0:5] == "hd://"):
     method = method[5:]
     i = string.index(method, '/')
     dir = method[i:]
-    drive = method[0:i]
+    driveAndType = method[0:i]
+
+    i = string.index(driveAndType, ":")
+    drive = driveAndType[0:i]
+    type = driveAndType[i + 1:]
 
     from harddrive import InstallMethod
-    method = InstallMethod(drive, dir)
+    method = InstallMethod(drive, type, dir)
 else:
     print "unknown install method:", method
     sys.exit(1)
diff --git a/gui.py b/gui.py
index 2e7002539..8a7c01542 100755
--- a/gui.py
+++ b/gui.py
@@ -18,7 +18,6 @@ from iw.mouse import *
 from iw.keyboard import *
 from iw.format import *
 from iw.congrats import *
-from iw.autopartition import *
 from iw.dependencies import *
 from iw.lilo import *
 from iw.installpath import *
diff --git a/harddrive.py b/harddrive.py
index 21a25b6bd..709216128 100644
--- a/harddrive.py
+++ b/harddrive.py
@@ -13,7 +13,8 @@ class InstallMethod:
 
     def readComps(self, hdlist):
 	isys.makeDevInode(self.device, '/tmp/' + self.device)
-	isys.mount('/tmp/' + self.device, "/tmp/hdimage");
+	isys.mount('/tmp/' + self.device, "/tmp/hdimage", 
+		   fstype = self.fstype);
 	cs = ComponentSet('i386', "/tmp/hdimage/" + self.path + 
 		'/RedHat/base/comps', hdlist)
 	isys.umount("/tmp/hdimage")
@@ -24,7 +25,8 @@ class InstallMethod:
 
     def readHeaders(self):
 	isys.makeDevInode(self.device, '/tmp/' + self.device)
-	isys.mount('/tmp/' + self.device, "/tmp/hdimage");
+	isys.mount('/tmp/' + self.device, "/tmp/hdimage", 
+		   fstype = self.fstype);
 	hl = []
 	path = "/tmp/hdimage" + self.path + "/RedHat/RPMS"
 	for n in os.listdir(path):
@@ -47,7 +49,8 @@ class InstallMethod:
 		self.needsUnmount = 0
 
 	if (not self.isMounted):
-	    isys.mount('/tmp/' + self.device, "/tmp/hdimage");
+	    isys.mount('/tmp/' + self.device, "/tmp/hdimage", 
+		       fstype = self.fstype)
 	    self.tree = "/tmp/hdimage/" + self.path
 	    self.needsUnmount = 1
 	    
@@ -58,7 +61,8 @@ class InstallMethod:
     def unlinkFilename(self, fullName):
 	pass
 	    
-    def __init__(self, device, path):
+    def __init__(self, device, type, path):
 	self.device = device
 	self.path = path
+	self.fstype = type
 	self.fnames = {}
diff --git a/kickstart.py b/kickstart.py
index b3f5ebb88..ecfcf131a 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -124,6 +124,7 @@ class Kickstart(InstallClass):
 		     "authconfig"	: self.doAuthconfig	,
 		     "cdrom"		: None			,
 		     "clearpart"	: self.doClearPart	,
+		     "harddrive"	: None			,
 		     "install"		: self.doInstall	,
 		     "network"		: self.doNetwork	,
 		     "lilo"		: self.doLilo		,
diff --git a/loader/loader.c b/loader/loader.c
index 10339212e..b929fd766 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -438,7 +438,10 @@ static int loadStage2Ramdisk(int fd, off_t size, int flags) {
 	return rc;
     }
 
-    if (devMakeInode("ram3", "/tmp/ram3")) return 1;
+    if (devMakeInode("ram3", "/tmp/ram3")) {
+	logMessage("failed to make device ram3");
+	return 1;
+    }
     
     if (doPwMount("/tmp/ram3", "/mnt/runtime", "ext2", 0, 0, NULL, NULL)) {
 	newtWinMessage(_("Error"), _("Ok"),
@@ -481,11 +484,12 @@ static char * setupHardDrive(char * device, char * type, char * dir,
 
 	rc = loadStage2Ramdisk(fd, 0, flags);
 	close(fd);
+	umount("/tmp/hdimage");
 	if (rc) return NULL;
     }
 
     url = malloc(50 + strlen(dir ? dir : ""));
-    sprintf(url, "hd://%s/%s", device + 5, dir ? dir : ".");
+    sprintf(url, "hd://%s:%s/%s", device, type, dir ? dir : ".");
 
     return url;
 }
@@ -638,7 +642,7 @@ static char * mountHardDrive(struct installMethod * method,
 
 	url = setupHardDrive(part->name + 5, type, dir, flags);
 	if (dir) free(dir);
-	if (url) {
+	if (!url) {
 	    newtWinMessage(_("Error"), _("Ok"), 
 			_("Device %s does not appear to contain "
 			  "a Red Hat installation tree."), part->name);
@@ -1054,7 +1058,7 @@ static char * setupKickstart(char * location, struct knownDevices * kd,
 	ksType = KS_CMD_CDROM;
 	table = NULL;
     } else if (ksHasCommand(KS_CMD_HD)) {
-	ksDeviceType = DEVICE_DISK;
+	ksDeviceType = DEVICE_UNKNOWN;
 	ksType = KS_CMD_HD;
 	table = ksHDOptions;
     } else if (ksHasCommand(KS_CMD_URL)) {
@@ -1066,16 +1070,19 @@ static char * setupKickstart(char * location, struct knownDevices * kd,
 	return NULL;
     }
 
-    for (i = 0; i < kd->numKnown; i++)
-	if (kd->known[i].class == ksDeviceType) break;
+    if (ksDeviceType != DEVICE_UNKNOWN) {
+	for (i = 0; i < kd->numKnown; i++)
+	    if (kd->known[i].class == ksDeviceType) break;
 
-    if (i == kd->numKnown) {
-	logMessage("no appropriate device for kickstart method is available");
-	return NULL;
-    }
+	if (i == kd->numKnown) {
+	    logMessage("no appropriate device for kickstart method is "
+		       "available");
+	    return NULL;
+	}
 
-    device = kd->known[i].name;
-    logMessage("kickstarting through device %s", device);
+	device = kd->known[i].name;
+	logMessage("kickstarting through device %s", device);
+    }
 
     if (!ksGetCommand(KS_CMD_XDISPLAY, NULL, &ksArgc, &ksArgv)) {
 	setenv("DISPLAY", ksArgv[1], 1);
@@ -1117,6 +1124,8 @@ static char * setupKickstart(char * location, struct knownDevices * kd,
 	return setupCdrom(NULL, location, kd, modInfo, modLoaded, modDeps, 
 			  flags, 1);
     } else if (ksType == KS_CMD_HD) {
+	logMessage("partname is %s", partname);
+
 	for (i = 0; i < kd->numKnown; i++) {
 	    if (kd->known[i].class != DEVICE_DISK) continue;
 	    if (!strncmp(kd->known[i].name, partname, strlen(partname) - 1))
@@ -1139,10 +1148,11 @@ static char * setupKickstart(char * location, struct knownDevices * kd,
 	    return NULL;
 	}
 
-	partNum = atoi(partname + 3);
+	partNum = atoi(partname + 3) - 1;
 	if (partTable.maxNumPartitions < partNum ||
 	    partTable.parts[partNum].type == -1) {
-	    logMessage("partition %d on device %s does not exist");
+	    logMessage("partition %d on device %s does not exist", partNum,
+		       kd->known[i].name);
 	    return NULL;
 	}
 
@@ -1158,7 +1168,7 @@ static char * setupKickstart(char * location, struct knownDevices * kd,
     return NULL;
 }
 
-static int parseCmdLineFlags(int flags, char * cmdLine) {
+static int parseCmdLineFlags(int flags, char * cmdLine, char ** ksSource) {
     int fd;
     char buf[500];
     int len;
@@ -1191,9 +1201,11 @@ static int parseCmdLineFlags(int flags, char * cmdLine) {
 	    flags |= LOADER_FLAGS_TEXT;
         else if (!strcasecmp(argv[i], "rescue"))
 	    flags |= LOADER_FLAGS_RESCUE;
-        else if (!strcasecmp(argv[i], "ks=floppy")) {
+        else if (!strcasecmp(argv[i], "ks=floppy"))
 	    flags |= LOADER_FLAGS_KSFLOPPY;
-	    logMessage("got ks=floppy");
+        else if (!strncasecmp(argv[i], "ks=hd:", 6)) {
+	    flags |= LOADER_FLAGS_KSHD;
+	    *ksSource = argv[i] + 6;
 	}
     }
 
@@ -1205,13 +1217,67 @@ struct moduleDependency_s {
     char ** deps;
 };
 
-int kickstartFromFloppy(char * location, moduleList modLoaded,
-			moduleDeps modDeps, int flags) {
+static int copyFile(char * source, char * dest) {
     int infd = -1, outfd = -1;
     char buf[4096];
     int i;
 
+    outfd = open(dest, O_CREAT | O_RDWR, 0666);
+    infd = open(source, O_RDONLY);
+
+    if (infd < 0) {
+	logMessage("failed to open %s: %s", source, strerror(errno));
+    }
+
+    while ((i = read(infd, buf, sizeof(buf))) > 0) {
+	if (write(outfd, buf, i) != i) break;
+    }
+
+    close(infd);
+    close(outfd);
+
+    return 0;
+}
+
+int kickstartFromHardDrive(char * location, 
+			   moduleList modLoaded, moduleDeps modDeps, 
+			   char * source, int flags) {
+    char * device;
+    char * fileName;
+    char * fullFn;
+
     mlLoadModule("vfat", modLoaded, modDeps, NULL, flags);
+
+    fileName = strchr(source, '/');
+    *fileName = '\0';
+    fileName++;
+    device = source;
+
+    if (devMakeInode(device, "/tmp/hddevice")) {
+	logMessage("failed to make device %s", device);
+	return 1;
+    }
+
+    if (doPwMount("/tmp/hddevice", "/mnt/hddrive", "ext2", 0, 0, 
+		  NULL, NULL) &&
+	doPwMount("/tmp/hddevice", "/mnt/hddrive", "vfat", 0, 0, 
+		  NULL, NULL)) {
+	logMessage("failed to mount %s", device);
+    }
+
+    fullFn = alloca(strlen(fileName) + 20);
+    sprintf(fullFn, "/mnt/hddrive/%s", fileName);
+    copyFile(fullFn, location);
+
+    umount("/mnt/hddrive");
+
+    return 0;
+}
+
+int kickstartFromFloppy(char * location, moduleList modLoaded,
+			moduleDeps modDeps, int flags) {
+    mlLoadModule("vfat", modLoaded, modDeps, NULL, flags);
+
     if (devMakeInode("fd0", "/tmp/fd0"))
 	return 1;
 
@@ -1226,16 +1292,7 @@ int kickstartFromFloppy(char * location, moduleList modLoaded,
 	return 1;
     }
 
-
-    outfd = open(location, O_CREAT | O_RDWR, 0666);
-    infd = open("/tmp/ks/ks.cfg", O_RDONLY);
-
-    while ((i = read(infd, buf, sizeof(buf))) > 0) {
-	if (write(outfd, buf, i) != i) break;
-    }
-
-    close(infd);
-    close(outfd);
+    copyFile("/tmp/ks/ks.cfg", location);
 
     umount("/tmp/ks");
     unlink("/tmp/fd0");
@@ -1259,7 +1316,7 @@ int main(int argc, char ** argv) {
     int testing = 0;
     struct knownDevices kd;
     moduleInfoSet modInfo;
-    char * ksFile = NULL;
+    char * ksFile = NULL, * ksSource = NULL;
     struct poptOption optionTable[] = {
     	    { "cmdline", '\0', POPT_ARG_STRING, &cmdLine, 0 },
 	    { "ksfile", '\0', POPT_ARG_STRING, &ksFile, 0 },
@@ -1299,7 +1356,7 @@ int main(int argc, char ** argv) {
 
     if (testing) flags |= LOADER_FLAGS_TESTING;
 
-    flags = parseCmdLineFlags(flags, cmdLine);
+    flags = parseCmdLineFlags(flags, cmdLine, &ksSource);
 
     arg = FL_TESTING(flags) ? "./module-info" : "/modules/module-info";
     modInfo = isysNewModuleInfoSet();
@@ -1342,6 +1399,12 @@ logMessage("Flags are 0x%x\n", flags);
     pciProbe(modInfo, modLoaded, modDeps, probeOnly, &kd, flags);
     if (probeOnly) exit(0);
 
+    if (FL_KSHD(flags)) {
+	ksFile = "/tmp/ks.cfg";
+	kickstartFromHardDrive(ksFile, modLoaded, modDeps, ksSource, flags);
+	flags |= LOADER_FLAGS_KICKSTART;
+    }
+
     if (ksFile) {
 	ksReadCommands(ksFile);
 	url = setupKickstart("/mnt/source", &kd, modInfo, modLoaded, modDeps, 
diff --git a/loader/loader.h b/loader/loader.h
index 788d5f656..d567c0b54 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -8,6 +8,7 @@
 #define LOADER_FLAGS_RESCUE		(1 << 3)
 #define LOADER_FLAGS_KICKSTART		(1 << 4)
 #define LOADER_FLAGS_KSFLOPPY		(1 << 5)
+#define LOADER_FLAGS_KSHD		(1 << 6)
 
 #define FL_TESTING(a)	    ((a) & LOADER_FLAGS_TESTING)
 #define FL_EXPERT(a)	    ((a) & LOADER_FLAGS_EXPERT)
@@ -15,4 +16,5 @@
 #define FL_RESCUE(a)	    ((a) & LOADER_FLAGS_RESCUE)
 #define FL_KICKSTART(a)	    ((a) & LOADER_FLAGS_KICKSTART)
 #define FL_KSFLOPPY(a)	    ((a) & LOADER_FLAGS_KSFLOPPY)
+#define FL_KSHD(a)	    ((a) & LOADER_FLAGS_KSHD)
 
diff --git a/loader/net.c b/loader/net.c
index 797e4a4e2..c166e5caa 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -479,6 +479,7 @@ int kickstartNetwork(char * device, struct networkDeviceConfig * netDev,
     }
 
     if (!strcmp(bootProto, "dhcp") || !strcmp(bootProto, "bootp")) {
+	logMessage("sending dhcp request through device %s", device);
 	winStatus(50, 3, _("Dynamic IP"), 
 		  _("Sending request for IP information..."),
 		    0);
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 79f40d241..fc253fc53 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: ../libfdisk/gnomefsedit.c:2729
+#: ../libfdisk/gnomefsedit.c:2733
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-01 13:39-0400\n"
+"POT-Creation-Date: 1999-09-01 19:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../iw/language.py:10 ../text.py:28 ../text.py:1414
+#: ../iw/language.py:10 ../text.py:28 ../text.py:1419
 msgid "Language Selection"
 msgstr ""
 
@@ -26,10 +26,10 @@ msgstr ""
 #: ../text.py:31 ../text.py:79 ../text.py:130 ../text.py:156 ../text.py:193
 #: ../text.py:250 ../text.py:264 ../text.py:269 ../text.py:303 ../text.py:315
 #: ../text.py:323 ../text.py:332 ../text.py:393 ../text.py:461 ../text.py:483
-#: ../text.py:616 ../text.py:636 ../text.py:667 ../text.py:720 ../text.py:760
-#: ../text.py:825 ../text.py:876 ../text.py:926 ../text.py:971 ../text.py:1115
-#: ../text.py:1135 ../text.py:1147 ../text.py:1159 ../text.py:1337
-#: ../text.py:1381 ../text.py:1387
+#: ../text.py:616 ../text.py:636 ../text.py:667 ../text.py:725 ../text.py:765
+#: ../text.py:830 ../text.py:881 ../text.py:931 ../text.py:976 ../text.py:1120
+#: ../text.py:1140 ../text.py:1152 ../text.py:1164 ../text.py:1342
+#: ../text.py:1386 ../text.py:1392
 msgid "OK"
 msgstr ""
 
@@ -49,7 +49,7 @@ msgstr ""
 msgid "/dev/ttyS3 (COM4 under DOS)"
 msgstr ""
 
-#: ../iw/lilo.py:161 ../text.py:61 ../text.py:984 ../text.py:1042
+#: ../iw/lilo.py:161 ../text.py:61 ../text.py:989 ../text.py:1047
 msgid "Device"
 msgstr ""
 
@@ -60,35 +60,35 @@ msgstr ""
 
 #. code to create dialog in gtk+
 #: ../libfdisk/fsedit.c:263 ../libfdisk/fsedit.c:283 ../libfdisk/fsedit.c:295
-#: ../libfdisk/fsedit.c:704 ../libfdisk/fsedit.c:711 ../libfdisk/fsedit.c:718
-#: ../libfdisk/fsedit.c:727 ../libfdisk/fsedit.c:739 ../libfdisk/fsedit.c:749
-#: ../libfdisk/fsedit.c:778 ../libfdisk/fsedit.c:793 ../libfdisk/fsedit.c:1084
-#: ../libfdisk/gnomefsedit.c:596 ../libfdisk/gnomefsedit.c:936
-#: ../libfdisk/gnomefsedit.c:962 ../libfdisk/gnomefsedit.c:998
-#: ../libfdisk/gnomefsedit.c:1203 ../libfdisk/gnomefsedit.c:1297
-#: ../libfdisk/gnomefsedit.c:1315 ../libfdisk/gnomefsedit.c:1553
-#: ../libfdisk/gnomefsedit.c:1782 ../libfdisk/gnomefsedit.c:1793
-#: ../libfdisk/gnomefsedit.c:1803 ../libfdisk/gnomefsedit.c:1811
-#: ../libfdisk/gnomefsedit.c:1826 ../libfdisk/gnomefsedit.c:1883
-#: ../libfdisk/gnomefsedit.c:1957 ../libfdisk/newtfsedit.c:116
+#: ../libfdisk/fsedit.c:706 ../libfdisk/fsedit.c:713 ../libfdisk/fsedit.c:720
+#: ../libfdisk/fsedit.c:729 ../libfdisk/fsedit.c:741 ../libfdisk/fsedit.c:751
+#: ../libfdisk/fsedit.c:780 ../libfdisk/fsedit.c:795 ../libfdisk/fsedit.c:1089
+#: ../libfdisk/gnomefsedit.c:600 ../libfdisk/gnomefsedit.c:940
+#: ../libfdisk/gnomefsedit.c:966 ../libfdisk/gnomefsedit.c:1002
+#: ../libfdisk/gnomefsedit.c:1207 ../libfdisk/gnomefsedit.c:1301
+#: ../libfdisk/gnomefsedit.c:1319 ../libfdisk/gnomefsedit.c:1557
+#: ../libfdisk/gnomefsedit.c:1786 ../libfdisk/gnomefsedit.c:1797
+#: ../libfdisk/gnomefsedit.c:1807 ../libfdisk/gnomefsedit.c:1815
+#: ../libfdisk/gnomefsedit.c:1830 ../libfdisk/gnomefsedit.c:1887
+#: ../libfdisk/gnomefsedit.c:1961 ../libfdisk/newtfsedit.c:116
 #: ../libfdisk/newtfsedit.c:449 ../libfdisk/newtfsedit.c:527
 #: ../libfdisk/newtfsedit.c:545 ../libfdisk/newtfsedit.c:581
-#: ../libfdisk/newtfsedit.c:1303 ../libfdisk/newtfsedit.c:1311
-#: ../libfdisk/newtfsedit.c:1436 ../libfdisk/newtfsedit.c:1457
-#: ../libfdisk/newtfsedit.c:1551 ../text.py:63 ../text.py:989 ../text.py:1002
-#: ../text.py:1057
+#: ../libfdisk/newtfsedit.c:1309 ../libfdisk/newtfsedit.c:1317
+#: ../libfdisk/newtfsedit.c:1442 ../libfdisk/newtfsedit.c:1463
+#: ../libfdisk/newtfsedit.c:1557 ../text.py:63 ../text.py:994 ../text.py:1007
+#: ../text.py:1062
 msgid "Ok"
 msgstr ""
 
-#: ../gui.py:277 ../libfdisk/fsedit.c:995 ../libfdisk/newtfsedit.c:1303
-#: ../libfdisk/newtfsedit.c:1311 ../text.py:63 ../text.py:64 ../text.py:79
+#: ../gui.py:279 ../libfdisk/fsedit.c:1000 ../libfdisk/newtfsedit.c:1309
+#: ../libfdisk/newtfsedit.c:1317 ../text.py:63 ../text.py:64 ../text.py:79
 #: ../text.py:102 ../text.py:130 ../text.py:133 ../text.py:156 ../text.py:179
 #: ../text.py:193 ../text.py:195 ../text.py:214 ../text.py:216 ../text.py:250
 #: ../text.py:362 ../text.py:393 ../text.py:461 ../text.py:463 ../text.py:483
-#: ../text.py:616 ../text.py:667 ../text.py:669 ../text.py:720 ../text.py:760
-#: ../text.py:825 ../text.py:876 ../text.py:885 ../text.py:901 ../text.py:910
-#: ../text.py:927 ../text.py:971 ../text.py:978 ../text.py:1058
-#: ../text.py:1115 ../text.py:1116 ../text.py:1337 ../text.py:1359
+#: ../text.py:616 ../text.py:667 ../text.py:669 ../text.py:725 ../text.py:765
+#: ../text.py:830 ../text.py:881 ../text.py:890 ../text.py:906 ../text.py:915
+#: ../text.py:932 ../text.py:976 ../text.py:983 ../text.py:1063
+#: ../text.py:1120 ../text.py:1121 ../text.py:1342 ../text.py:1364
 msgid "Back"
 msgstr ""
 
@@ -100,11 +100,11 @@ msgstr ""
 msgid "Emulate 3 Buttons?"
 msgstr ""
 
-#: ../text.py:92 ../text.py:1349
+#: ../text.py:92 ../text.py:1354
 msgid "Mouse Selection"
 msgstr ""
 
-#: ../text.py:128 ../text.py:1416
+#: ../text.py:128 ../text.py:1421
 msgid "Keyboard Selection"
 msgstr ""
 
@@ -132,7 +132,7 @@ msgstr ""
 msgid "Upgrade Existing Installation"
 msgstr ""
 
-#: ../text.py:154 ../text.py:1419
+#: ../text.py:154 ../text.py:1424
 msgid "Installation Type"
 msgstr ""
 
@@ -140,7 +140,7 @@ msgstr ""
 msgid "What type of system would you like to install?"
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1551 ../text.py:176 ../text.py:1155
+#: ../libfdisk/newtfsedit.c:1557 ../text.py:176 ../text.py:1160
 msgid "Error"
 msgstr ""
 
@@ -167,26 +167,26 @@ msgid ""
 "like to customize the set of packages that will be upgraded?"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:272 ../libfdisk/gnomefsedit.c:521
-#: ../libfdisk/gnomefsedit.c:897 ../libfdisk/gnomefsedit.c:1016
-#: ../libfdisk/gnomefsedit.c:2119 ../libfdisk/gnomefsedit.c:2140
+#: ../libfdisk/fsedit.c:272 ../libfdisk/gnomefsedit.c:525
+#: ../libfdisk/gnomefsedit.c:901 ../libfdisk/gnomefsedit.c:1020
+#: ../libfdisk/gnomefsedit.c:2123 ../libfdisk/gnomefsedit.c:2144
 #: ../libfdisk/newtfsedit.c:486 ../libfdisk/newtfsedit.c:697
-#: ../libfdisk/newtfsedit.c:1489 ../libfdisk/newtfsedit.c:1507
-#: ../libfdisk/newtfsedit.c:1592 ../text.py:214 ../text.py:901 ../text.py:904
+#: ../libfdisk/newtfsedit.c:1495 ../libfdisk/newtfsedit.c:1513
+#: ../libfdisk/newtfsedit.c:1598 ../text.py:214 ../text.py:906 ../text.py:909
 msgid "Yes"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:272 ../libfdisk/gnomefsedit.c:521
-#: ../libfdisk/gnomefsedit.c:897 ../libfdisk/gnomefsedit.c:1016
-#: ../libfdisk/gnomefsedit.c:2119 ../libfdisk/gnomefsedit.c:2140
+#: ../libfdisk/fsedit.c:272 ../libfdisk/gnomefsedit.c:525
+#: ../libfdisk/gnomefsedit.c:901 ../libfdisk/gnomefsedit.c:1020
+#: ../libfdisk/gnomefsedit.c:2123 ../libfdisk/gnomefsedit.c:2144
 #: ../libfdisk/newtfsedit.c:486 ../libfdisk/newtfsedit.c:697
-#: ../libfdisk/newtfsedit.c:1489 ../libfdisk/newtfsedit.c:1507
-#: ../libfdisk/newtfsedit.c:1592 ../text.py:214 ../text.py:219 ../text.py:901
-#: ../text.py:907
+#: ../libfdisk/newtfsedit.c:1495 ../libfdisk/newtfsedit.c:1513
+#: ../libfdisk/newtfsedit.c:1598 ../text.py:214 ../text.py:219 ../text.py:906
+#: ../text.py:912
 msgid "No"
 msgstr ""
 
-#: ../text.py:229 ../text.py:1444
+#: ../text.py:229 ../text.py:1449
 msgid "Root Password"
 msgstr ""
 
@@ -221,10 +221,10 @@ msgstr ""
 msgid "The passwords you entered were different. Please try again."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:263 ../libfdisk/gnomefsedit.c:596
-#: ../libfdisk/gnomefsedit.c:1553 ../libfdisk/gnomefsedit.c:1957
-#: ../libfdisk/newtfsedit.c:450 ../libfdisk/newtfsedit.c:1507 ../text.py:283
-#: ../text.py:989 ../text.py:1007
+#: ../libfdisk/fsedit.c:263 ../libfdisk/gnomefsedit.c:600
+#: ../libfdisk/gnomefsedit.c:1557 ../libfdisk/gnomefsedit.c:1961
+#: ../libfdisk/newtfsedit.c:450 ../libfdisk/newtfsedit.c:1513 ../text.py:283
+#: ../text.py:994 ../text.py:1012
 msgid "Cancel"
 msgstr ""
 
@@ -271,7 +271,7 @@ msgid ""
 "your system's configuration."
 msgstr ""
 
-#: ../text.py:369 ../text.py:1446
+#: ../text.py:369 ../text.py:1451
 msgid "User Account Setup"
 msgstr ""
 
@@ -286,18 +286,18 @@ msgstr ""
 msgid "User name"
 msgstr ""
 
-#: ../iw/account.py:177 ../libfdisk/newtfsedit.c:1309 ../text.py:392
+#: ../iw/account.py:177 ../libfdisk/newtfsedit.c:1315 ../text.py:392
 msgid "Add"
 msgstr ""
 
-#: ../iw/account.py:181 ../libfdisk/newtfsedit.c:1302
-#: ../libfdisk/newtfsedit.c:1310 ../text.py:392
+#: ../iw/account.py:181 ../libfdisk/newtfsedit.c:1308
+#: ../libfdisk/newtfsedit.c:1316 ../text.py:392
 msgid "Delete"
 msgstr ""
 
-#: ../iw/account.py:179 ../libfdisk/newtfsedit.c:1302
-#: ../libfdisk/newtfsedit.c:1310 ../text.py:393 ../text.py:1057
-#: ../text.py:1078
+#: ../iw/account.py:179 ../libfdisk/newtfsedit.c:1308
+#: ../libfdisk/newtfsedit.c:1316 ../text.py:393 ../text.py:1062
+#: ../text.py:1083
 msgid "Edit"
 msgstr ""
 
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Hostname"
 msgstr ""
 
-#: ../text.py:698
+#: ../text.py:703
 msgid ""
 "What partitions would you like to format? We strongly suggest formatting all "
 "of the system partitions, including /, /usr, and /var. There is no need to "
@@ -411,50 +411,50 @@ msgid ""
 "previous install."
 msgstr ""
 
-#: ../text.py:718
+#: ../text.py:723
 msgid "Check for bad blocks during format"
 msgstr ""
 
-#: ../text.py:722
+#: ../text.py:727
 msgid "Choose Partitions to Format"
 msgstr ""
 
-#: ../iw/package.py:443 ../text.py:758
+#: ../iw/package.py:443 ../text.py:763
 msgid "Select individual packages"
 msgstr ""
 
-#: ../iw/package.py:376 ../text.py:762 ../text.py:827
+#: ../iw/package.py:376 ../text.py:767 ../text.py:832
 msgid "Package Group Selection"
 msgstr ""
 
-#: ../text.py:854 ../text.py:1454
+#: ../text.py:859 ../text.py:1459
 msgid "Package Dependencies"
 msgstr ""
 
-#: ../text.py:855
+#: ../text.py:860
 msgid ""
 "Some of the packages you have selected to install require packages you have "
 "not selected. If you just select Ok all of those required packages will be "
 "installed."
 msgstr ""
 
-#: ../iw/dependencies.py:29 ../iw/progress.py:105 ../text.py:861
+#: ../iw/dependencies.py:29 ../iw/progress.py:105 ../text.py:866
 msgid "Package"
 msgstr ""
 
-#: ../iw/dependencies.py:29 ../text.py:861
+#: ../iw/dependencies.py:29 ../text.py:866
 msgid "Requirement"
 msgstr ""
 
-#: ../iw/dependencies.py:36 ../text.py:873
+#: ../iw/dependencies.py:36 ../text.py:878
 msgid "Install packages to satisfy dependencies"
 msgstr ""
 
-#: ../text.py:891 ../text.py:1143 ../text.py:1461
+#: ../text.py:896 ../text.py:1148 ../text.py:1466
 msgid "Bootdisk"
 msgstr ""
 
-#: ../text.py:892
+#: ../text.py:897
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without "
 "depending on the normal bootloader. This is useful if you don't want to "
@@ -466,7 +466,7 @@ msgid ""
 "Would you like to create a bootdisk for your system?"
 msgstr ""
 
-#: ../text.py:918
+#: ../text.py:923
 msgid ""
 "A few systems will need to pass special options to the kernel at boot time "
 "for the system to function properly. If you need to pass boot options to the "
@@ -474,66 +474,66 @@ msgid ""
 "blank."
 msgstr ""
 
-#: ../iw/lilo.py:128 ../text.py:924
+#: ../iw/lilo.py:128 ../text.py:929
 msgid "Use linear mode (needed for some SCSI drives)"
 msgstr ""
 
-#: ../text.py:926 ../text.py:1147 ../text.py:1148 ../text.py:1159
-#: ../text.py:1160
+#: ../text.py:931 ../text.py:1152 ../text.py:1153 ../text.py:1164
+#: ../text.py:1165
 msgid "Skip"
 msgstr ""
 
-#: ../text.py:929 ../text.py:968 ../text.py:1065 ../text.py:1428
-#: ../text.py:1430 ../text.py:1432
+#: ../text.py:934 ../text.py:973 ../text.py:1070 ../text.py:1433
+#: ../text.py:1435 ../text.py:1437
 msgid "LILO Configuration"
 msgstr ""
 
-#: ../text.py:969
+#: ../text.py:974
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../iw/lilo.py:161 ../iw/lilo.py:196 ../text.py:985 ../text.py:1042
+#: ../iw/lilo.py:161 ../iw/lilo.py:196 ../text.py:990 ../text.py:1047
 msgid "Boot label"
 msgstr ""
 
-#: ../text.py:989 ../text.py:1009
+#: ../text.py:994 ../text.py:1014
 msgid "Clear"
 msgstr ""
 
-#: ../text.py:997
+#: ../text.py:1002
 msgid "Edit Boot Label"
 msgstr ""
 
-#: ../iw/lilo.py:161 ../text.py:1042
+#: ../iw/lilo.py:161 ../text.py:1047
 msgid "Partition type"
 msgstr ""
 
-#: ../iw/lilo.py:161 ../text.py:1042
+#: ../iw/lilo.py:161 ../text.py:1047
 msgid "Default"
 msgstr ""
 
-#: ../text.py:1060
+#: ../text.py:1065
 msgid ""
 "The boot manager Red Hat uses can boot other operating systems as well. You "
 "need to tell me what partitions you would like to be able to boot and what "
 "label you want to use for each of them."
 msgstr ""
 
-#: ../text.py:1111
+#: ../text.py:1116
 msgid "Installation to begin"
 msgstr ""
 
-#: ../text.py:1112
+#: ../text.py:1117
 msgid ""
 "A complete log of your installation will be in /tmp/install.log after "
 "rebooting your system. You may want to keep this file for later reference."
 msgstr ""
 
-#: ../text.py:1127
+#: ../text.py:1132
 msgid "Complete"
 msgstr ""
 
-#: ../iw/congrats.py:17 ../text.py:1128
+#: ../iw/congrats.py:17 ../text.py:1133
 msgid ""
 "Congratulations, installation is complete.\n"
 "\n"
@@ -545,169 +545,169 @@ msgid ""
 "chapter of the Official Red Hat Linux User's Guide."
 msgstr ""
 
-#: ../iw/bootdisk.py:40 ../text.py:1144
+#: ../iw/bootdisk.py:40 ../text.py:1149
 msgid ""
 "Insert a blank floppy in the first floppy drive. All data on this disk will "
 "be erased during creation of the boot disk."
 msgstr ""
 
-#: ../iw/bootdisk.py:44 ../text.py:1156
+#: ../iw/bootdisk.py:44 ../text.py:1161
 msgid ""
 "An error occured while making the boot disk. Please make sure that there is "
 "a formatted floppy in the first floppy drive."
 msgstr ""
 
-#: ../text.py:1218
+#: ../text.py:1223
 msgid "Package Installation"
 msgstr ""
 
-#: ../text.py:1220
+#: ../text.py:1225
 msgid "Name   : "
 msgstr ""
 
-#: ../text.py:1221
+#: ../text.py:1226
 msgid "Size   : "
 msgstr ""
 
-#: ../text.py:1222
+#: ../text.py:1227
 msgid "Summary: "
 msgstr ""
 
-#: ../text.py:1248
+#: ../text.py:1253
 msgid "    Packages"
 msgstr ""
 
-#: ../text.py:1249
+#: ../text.py:1254
 msgid "       Bytes"
 msgstr ""
 
-#: ../text.py:1250
+#: ../text.py:1255
 msgid "        Time"
 msgstr ""
 
-#: ../text.py:1252
+#: ../text.py:1257
 msgid "Total    :"
 msgstr ""
 
-#: ../text.py:1259
+#: ../text.py:1264
 msgid "Completed:   "
 msgstr ""
 
-#: ../text.py:1269
+#: ../text.py:1274
 msgid "Remaining:  "
 msgstr ""
 
-#: ../text.py:1339
+#: ../text.py:1344
 msgid "What time zone are you located in?"
 msgstr ""
 
-#: ../text.py:1347
+#: ../text.py:1352
 msgid "Hardware clock set to GMT?"
 msgstr ""
 
-#: ../text.py:1387 ../text.py:1388
+#: ../text.py:1392 ../text.py:1393
 msgid "Debug"
 msgstr ""
 
-#: ../text.py:1400
+#: ../text.py:1405
 msgid "Red Hat Linux (C) 1999 Red Hat, Inc."
 msgstr ""
 
-#: ../text.py:1402
+#: ../text.py:1407
 msgid ""
 "  <Tab>/<Alt-Tab> between elements   |  <Space> selects   |  <F12> next "
 "screen"
 msgstr ""
 
-#: ../text.py:1418
+#: ../text.py:1423
 msgid "Welcome"
 msgstr ""
 
-#: ../iw/lilo.py:84 ../iw/lilo.py:184 ../text.py:1424
+#: ../iw/lilo.py:84 ../iw/lilo.py:184 ../text.py:1429
 msgid "Partition"
 msgstr ""
 
-#: ../text.py:1426
+#: ../text.py:1431
 msgid "Filesystem Formatting"
 msgstr ""
 
-#: ../text.py:1434
+#: ../text.py:1439
 msgid "Hostname Setup"
 msgstr ""
 
-#: ../text.py:1436
+#: ../text.py:1441
 msgid "Network Setup"
 msgstr ""
 
-#: ../text.py:1438 ../text.py:1440
+#: ../text.py:1443 ../text.py:1445
 msgid "Mouse Configuration"
 msgstr ""
 
-#: ../text.py:1442
+#: ../text.py:1447
 msgid "Time Zone Setup"
 msgstr ""
 
-#: ../text.py:1448
+#: ../text.py:1453
 msgid "Authentication"
 msgstr ""
 
-#: ../text.py:1450
+#: ../text.py:1455
 msgid "Package Groups"
 msgstr ""
 
-#: ../text.py:1452 ../text.py:1469
+#: ../text.py:1457 ../text.py:1474
 msgid "Individual Packages"
 msgstr ""
 
-#: ../text.py:1456
+#: ../text.py:1461
 msgid "Boot Disk"
 msgstr ""
 
-#: ../text.py:1458
+#: ../text.py:1463
 msgid "Installation Begins"
 msgstr ""
 
-#: ../text.py:1460
+#: ../text.py:1465
 msgid "Install System"
 msgstr ""
 
-#: ../text.py:1462
+#: ../text.py:1467
 msgid "Installation Complete"
 msgstr ""
 
-#: ../text.py:1467
+#: ../text.py:1472
 msgid "Examine System"
 msgstr ""
 
-#: ../text.py:1468
+#: ../text.py:1473
 msgid "Customize Upgrade"
 msgstr ""
 
-#: ../text.py:1470
+#: ../text.py:1475
 msgid "Upgrade System"
 msgstr ""
 
-#: ../text.py:1471
+#: ../text.py:1476
 msgid "Upgrade Complete"
 msgstr ""
 
-#: ../gui.py:270
+#: ../gui.py:272
 msgid "Red Hat Linux Installer"
 msgstr ""
 
-#: ../gui.py:280
+#: ../gui.py:282
 msgid "Finish"
 msgstr ""
 
-#: ../gui.py:281
+#: ../gui.py:283
 msgid "Hide Help"
 msgstr ""
 
-#: ../gui.py:282
+#: ../gui.py:284
 msgid "Show Help"
 msgstr ""
 
-#: ../gui.py:303
+#: ../gui.py:305
 msgid "Online Help"
 msgstr ""
 
@@ -751,26 +751,6 @@ msgstr ""
 msgid "NIS Server: "
 msgstr ""
 
-#: ../iw/autopartition.py:16
-msgid "Auto partition"
-msgstr ""
-
-#: ../iw/autopartition.py:29 ../libfdisk/gnomefsedit.c:2045
-msgid "Workstation"
-msgstr ""
-
-#: ../iw/autopartition.py:38
-msgid "Remove all data"
-msgstr ""
-
-#: ../iw/autopartition.py:41 ../libfdisk/gnomefsedit.c:1983
-msgid "Remove Linux partitions"
-msgstr ""
-
-#: ../iw/autopartition.py:44 ../libfdisk/gnomefsedit.c:1994
-msgid "Use existing free space"
-msgstr ""
-
 #: ../iw/bootdisk.py:10
 msgid "Bootdisk Creation"
 msgstr ""
@@ -809,36 +789,36 @@ msgstr ""
 msgid "Choose partitions to Format"
 msgstr ""
 
-#: ../iw/format.py:44
+#: ../iw/format.py:46
 msgid "Check for bad blocks while formatting"
 msgstr ""
 
-#: ../iw/installpath.py:35
+#: ../iw/installpath.py:34
 msgid "Custom"
 msgstr ""
 
-#: ../iw/installpath.py:36
+#: ../iw/installpath.py:35
 msgid "GNOME Workstation"
 msgstr ""
 
-#: ../iw/installpath.py:37
+#: ../iw/installpath.py:36
 msgid "KDE Workstation"
 msgstr ""
 
-#: ../iw/installpath.py:38 ../libfdisk/gnomefsedit.c:2025
-#: ../libfdisk/gnomefsedit.c:2045
+#: ../iw/installpath.py:37 ../libfdisk/gnomefsedit.c:2029
+#: ../libfdisk/gnomefsedit.c:2049
 msgid "Server"
 msgstr ""
 
-#: ../iw/installpath.py:72
+#: ../iw/installpath.py:71
 msgid "Install Type"
 msgstr ""
 
-#: ../iw/installpath.py:121
+#: ../iw/installpath.py:120
 msgid "Install"
 msgstr ""
 
-#: ../iw/installpath.py:123
+#: ../iw/installpath.py:122
 msgid "Upgrade"
 msgstr ""
 
@@ -1006,23 +986,23 @@ msgstr ""
 msgid "Time Zone Selection"
 msgstr ""
 
-#: ../iw/timezone.py:90
+#: ../iw/timezone.py:108
 msgid "View:"
 msgstr ""
 
-#: ../iw/timezone.py:120
+#: ../iw/timezone.py:138
 msgid "Use Daylight Saving Time"
 msgstr ""
 
-#: ../iw/timezone.py:127
+#: ../iw/timezone.py:145
 msgid "Location"
 msgstr ""
 
-#: ../iw/timezone.py:128
+#: ../iw/timezone.py:146
 msgid "UTC Offset"
 msgstr ""
 
-#: ../iw/timezone.py:132
+#: ../iw/timezone.py:150
 msgid "System clock uses UTC"
 msgstr ""
 
@@ -1054,29 +1034,33 @@ msgstr ""
 msgid "Test failed"
 msgstr ""
 
-#: ../iw/xconfig.py:24
+#: ../iw/xconfig.py:24 ../iw/xconfig.py:128
+msgid "Customize X Configuration"
+msgstr ""
+
+#: ../iw/xconfig.py:40
+msgid "Bits per Pixel"
+msgstr ""
+
+#: ../iw/xconfig.py:59
 msgid "X Configuration"
 msgstr ""
 
-#: ../iw/xconfig.py:54
+#: ../iw/xconfig.py:103
 msgid ""
 "In most cases your video hardware can be probed to automatically determine "
 "the best settings for your display."
 msgstr ""
 
-#: ../iw/xconfig.py:62
+#: ../iw/xconfig.py:111
 msgid "Autoprobe results:"
 msgstr ""
 
-#: ../iw/xconfig.py:74
+#: ../iw/xconfig.py:124
 msgid "Test this configuration"
 msgstr ""
 
-#: ../iw/xconfig.py:77
-msgid "Customize X Configuration"
-msgstr ""
-
-#: ../iw/xconfig.py:80
+#: ../iw/xconfig.py:131
 msgid "Skip X Configuration"
 msgstr ""
 
@@ -1136,17 +1120,17 @@ msgstr ""
 msgid "There is not enough disk space for the chosen partitioning."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:704 ../libfdisk/fsedit.c:711 ../libfdisk/fsedit.c:718
-#: ../libfdisk/fsedit.c:727 ../libfdisk/fsedit.c:739 ../libfdisk/fsedit.c:749
+#: ../libfdisk/fsedit.c:706 ../libfdisk/fsedit.c:713 ../libfdisk/fsedit.c:720
+#: ../libfdisk/fsedit.c:729 ../libfdisk/fsedit.c:741 ../libfdisk/fsedit.c:751
 msgid "Bad Mount Point"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:705
+#: ../libfdisk/fsedit.c:707
 #, c-format
 msgid "The %s directory must be on the root filesystem."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:712
+#: ../libfdisk/fsedit.c:714
 #, c-format
 msgid ""
 "The mount point %s is illegal.\n"
@@ -1154,7 +1138,7 @@ msgid ""
 "Mount points must begin with a leading /."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:719
+#: ../libfdisk/fsedit.c:721
 #, c-format
 msgid ""
 "The mount point %s is illegal.\n"
@@ -1162,7 +1146,7 @@ msgid ""
 "Mount points may not end with a /."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:728
+#: ../libfdisk/fsedit.c:730
 #, c-format
 msgid ""
 "The mount point %s is illegal.\n"
@@ -1170,7 +1154,7 @@ msgid ""
 "Mount points may only printable characters."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:740
+#: ../libfdisk/fsedit.c:742
 #, c-format
 msgid ""
 "The mount point %s is illegal.\n"
@@ -1178,7 +1162,7 @@ msgid ""
 "System partitions must be on Linux Native partitions."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:750
+#: ../libfdisk/fsedit.c:752
 #, c-format
 msgid ""
 "The mount point %s is illegal.\n"
@@ -1186,28 +1170,28 @@ msgid ""
 "/usr must be on a Linux Native partition or an NFS volume."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:778
+#: ../libfdisk/fsedit.c:780
 msgid "Too Many Drives"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:779
+#: ../libfdisk/fsedit.c:781
 msgid ""
 "You have more drives than this program supports. Please use the standard "
 "fdisk program to setup your drives and please notify Red Hat Software that "
 "you saw this message."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:793
+#: ../libfdisk/fsedit.c:795
 msgid "No Drives Found"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:794
+#: ../libfdisk/fsedit.c:796
 msgid ""
 "An error has occurred - no valid devices were found on which to create new "
 "filesystems.  Please check your hardware for the cause of this problem."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:990
+#: ../libfdisk/fsedit.c:995
 #, c-format
 msgid ""
 "A disk with a corrupt Sun disklabel has been found while reading block "
@@ -1215,157 +1199,157 @@ msgid ""
 "device."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:994
+#: ../libfdisk/fsedit.c:999
 msgid "Corrupt Sun disklabel"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:995 ../libfdisk/fsedit.c:1048
-#: ../libfdisk/fsedit.c:1072
+#: ../libfdisk/fsedit.c:1000 ../libfdisk/fsedit.c:1053
+#: ../libfdisk/fsedit.c:1077
 msgid "Skip Drive"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:1004 ../libfdisk/fsedit.c:1068
+#: ../libfdisk/fsedit.c:1009 ../libfdisk/fsedit.c:1073
 #, c-format
 msgid ""
 "An error occurred reading the partition table for the block device %s.  The "
 "error was"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:1042
+#: ../libfdisk/fsedit.c:1047
 #, c-format
 msgid ""
 "The partition table on device %s is corrupted.  To create new partitions it "
 "must be initialized, causing the loss of ALL DATA on this drive."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:1047
+#: ../libfdisk/fsedit.c:1052
 msgid "Bad Partition Table"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:1048
+#: ../libfdisk/fsedit.c:1053
 msgid "Initialize"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:1072
+#: ../libfdisk/fsedit.c:1077
 msgid "Retry"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:1084
+#: ../libfdisk/fsedit.c:1089
 msgid "BSD Disklabel"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:1084
+#: ../libfdisk/fsedit.c:1089
 msgid ""
 "A disk with a BSD disklabel has been found. The Red Hat installation only "
 "supports BSD Disklabels in read-only mode, so you must use a custom install "
 "and fdisk (instead of Disk Druid) for machines with BSD Disklabels."
 msgstr ""
 
-#: ../libfdisk/fsedit.c:1114
+#: ../libfdisk/fsedit.c:1119
 #, c-format
 msgid "System error %d"
 msgstr ""
 
-#: ../libfdisk/fsedit.c:1123 ../libfdisk/fsedit.c:1125
+#: ../libfdisk/fsedit.c:1128 ../libfdisk/fsedit.c:1130
 msgid "Fdisk Error"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:458 ../libfdisk/gnomefsedit.c:627
+#: ../libfdisk/gnomefsedit.c:462 ../libfdisk/gnomefsedit.c:631
 msgid "<Swap Partition>"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:466 ../libfdisk/gnomefsedit.c:629
+#: ../libfdisk/gnomefsedit.c:470 ../libfdisk/gnomefsedit.c:633
 msgid "<RAID Partition>"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:521 ../libfdisk/newtfsedit.c:697
+#: ../libfdisk/gnomefsedit.c:525 ../libfdisk/newtfsedit.c:697
 msgid "Delete Partition"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:522 ../libfdisk/newtfsedit.c:698
+#: ../libfdisk/gnomefsedit.c:526 ../libfdisk/newtfsedit.c:698
 msgid "Are you sure you want to delete this partition?"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:580 ../libfdisk/gnomefsedit.c:586
-#: ../libfdisk/gnomefsedit.c:590 ../libfdisk/gnomefsedit.c:592
+#: ../libfdisk/gnomefsedit.c:584 ../libfdisk/gnomefsedit.c:590
+#: ../libfdisk/gnomefsedit.c:594 ../libfdisk/gnomefsedit.c:596
 #: ../libfdisk/newtfsedit.c:263 ../libfdisk/newtfsedit.c:269
 #: ../libfdisk/newtfsedit.c:273 ../libfdisk/newtfsedit.c:275
 msgid "Edit Partition"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:607 ../libfdisk/gnomefsedit.c:1562
+#: ../libfdisk/gnomefsedit.c:611 ../libfdisk/gnomefsedit.c:1566
 msgid "Mount Point:"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:642
+#: ../libfdisk/gnomefsedit.c:646
 msgid "Size (Megs):"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:673
+#: ../libfdisk/gnomefsedit.c:677
 msgid "Grow to fill disk?"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:692 ../libfdisk/newtfsedit.c:335
+#: ../libfdisk/gnomefsedit.c:696 ../libfdisk/newtfsedit.c:335
 msgid "Allocation Status:"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:696 ../libfdisk/newtfsedit.c:337
+#: ../libfdisk/gnomefsedit.c:700 ../libfdisk/newtfsedit.c:337
 msgid "Successful"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:699 ../libfdisk/newtfsedit.c:339
+#: ../libfdisk/gnomefsedit.c:703 ../libfdisk/newtfsedit.c:339
 msgid "Failed"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:711 ../libfdisk/newtfsedit.c:344
+#: ../libfdisk/gnomefsedit.c:715 ../libfdisk/newtfsedit.c:344
 msgid "Failure Reason:"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:725 ../libfdisk/gnomefsedit.c:1588
+#: ../libfdisk/gnomefsedit.c:729 ../libfdisk/gnomefsedit.c:1592
 msgid "Partition Type:"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:792
+#: ../libfdisk/gnomefsedit.c:796
 msgid "Allowable Drives:"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:897 ../libfdisk/gnomefsedit.c:1782
+#: ../libfdisk/gnomefsedit.c:901 ../libfdisk/gnomefsedit.c:1786
 #: ../libfdisk/newtfsedit.c:486
 msgid "No Mount Point"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:898 ../libfdisk/newtfsedit.c:487
+#: ../libfdisk/gnomefsedit.c:902 ../libfdisk/newtfsedit.c:487
 msgid ""
 "You have not selected a mount point for this partition. Are you sure you "
 "want to do this?"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:936 ../libfdisk/newtfsedit.c:527
+#: ../libfdisk/gnomefsedit.c:940 ../libfdisk/newtfsedit.c:527
 msgid "Mount Point Error"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:937 ../libfdisk/newtfsedit.c:528
+#: ../libfdisk/gnomefsedit.c:941 ../libfdisk/newtfsedit.c:528
 msgid ""
 "The mount point requested is either an illegal path or is already in use. "
 "Please select a valid mount point."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:962 ../libfdisk/newtfsedit.c:545
+#: ../libfdisk/gnomefsedit.c:966 ../libfdisk/newtfsedit.c:545
 msgid "Size Error"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:963 ../libfdisk/newtfsedit.c:546
+#: ../libfdisk/gnomefsedit.c:967 ../libfdisk/newtfsedit.c:546
 msgid ""
 "The size requested is illegal. Make sure the size is greater and zero (0), "
 "and is specified int decimal (base 10) format."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:998 ../libfdisk/gnomefsedit.c:1883
+#: ../libfdisk/gnomefsedit.c:1002 ../libfdisk/gnomefsedit.c:1887
 #: ../libfdisk/newtfsedit.c:581
 msgid "Swap Size Error"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:999 ../libfdisk/gnomefsedit.c:1884
+#: ../libfdisk/gnomefsedit.c:1003 ../libfdisk/gnomefsedit.c:1888
 #: ../libfdisk/newtfsedit.c:582
 #, c-format
 msgid ""
@@ -1373,22 +1357,22 @@ msgid ""
 "swap partition is %ld Megabytes."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1015 ../libfdisk/gnomefsedit.c:1022
+#: ../libfdisk/gnomefsedit.c:1019 ../libfdisk/gnomefsedit.c:1026
 msgid "No RAID Drive Constraint"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1017
+#: ../libfdisk/gnomefsedit.c:1021
 msgid ""
 "You have configured a RAID partition without constraining the partition to a "
 "single drive.\n"
 " Are you sure you want to do this?"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1023
+#: ../libfdisk/gnomefsedit.c:1027
 msgid "Close"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1024
+#: ../libfdisk/gnomefsedit.c:1028
 msgid ""
 "You have configured a RAID partition without constraining the partition to a "
 "single drive. Please select one drive to constrain this partition to."
@@ -1396,11 +1380,11 @@ msgstr ""
 
 #. XXXXX - for now destroy the raid entry since it
 #. now contains unallocated partitions!
-#: ../libfdisk/gnomefsedit.c:1203
+#: ../libfdisk/gnomefsedit.c:1207
 msgid "RAID Entry Incomplete"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1204
+#: ../libfdisk/gnomefsedit.c:1208
 #, c-format
 msgid ""
 "The raid device /dev/%s now contains partitions which are unallocated. The "
@@ -1409,12 +1393,12 @@ msgid ""
 msgstr ""
 
 #. build list of why they all failed
-#: ../libfdisk/gnomefsedit.c:1297 ../libfdisk/gnomefsedit.c:1316
-#: ../libfdisk/newtfsedit.c:84 ../libfdisk/newtfsedit.c:1488
+#: ../libfdisk/gnomefsedit.c:1301 ../libfdisk/gnomefsedit.c:1320
+#: ../libfdisk/newtfsedit.c:84 ../libfdisk/newtfsedit.c:1494
 msgid "Unallocated Partitions"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1301 ../libfdisk/gnomefsedit.c:1311
+#: ../libfdisk/gnomefsedit.c:1305 ../libfdisk/gnomefsedit.c:1315
 #: ../libfdisk/newtfsedit.c:88
 msgid ""
 "There are currently unallocated partition(s) present in the list of "
@@ -1422,135 +1406,147 @@ msgid ""
 "with the reason they were not allocated."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1574
+#: ../libfdisk/gnomefsedit.c:1578
 msgid "<Swap Partition"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1632
+#: ../libfdisk/gnomefsedit.c:1636
 msgid "RAID Device: /dev/"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1655
+#: ../libfdisk/gnomefsedit.c:1659
 msgid "RAID Type:"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1692
+#: ../libfdisk/gnomefsedit.c:1696
 msgid "Partitions For RAID Array:"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1783
+#: ../libfdisk/gnomefsedit.c:1787
 msgid "You have not selected a mount point. A mount point is required."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1793
+#: ../libfdisk/gnomefsedit.c:1797
 msgid "Booting From RAID Warning"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1794
+#: ../libfdisk/gnomefsedit.c:1798
 msgid ""
 "You have made this raid device mount as a booting partition.  Please make "
 "sure all the component partitions are bootable."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1803
+#: ../libfdisk/gnomefsedit.c:1807
 msgid "No RAID Device"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1804
+#: ../libfdisk/gnomefsedit.c:1808
 msgid "You have not selected a RAID device. A RAID point is required."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1811
+#: ../libfdisk/gnomefsedit.c:1815
 msgid "Used Raid Device"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1812
+#: ../libfdisk/gnomefsedit.c:1816
 #, c-format
 msgid ""
 "The raid device \"/dev/%s\" is already configured as a raid device. Please "
 "select another."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1825
+#: ../libfdisk/gnomefsedit.c:1829
 msgid "Not Enough Partitions"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1827
+#: ../libfdisk/gnomefsedit.c:1831
 msgid ""
 "You have not configured enough partitions for the RAID type you have "
 "selected."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1957
+#: ../libfdisk/gnomefsedit.c:1961
 msgid "Auto-Partition"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:1964
+#: ../libfdisk/gnomefsedit.c:1968
 msgid "Using Existing Disk Space"
 msgstr ""
 
+#: ../libfdisk/gnomefsedit.c:1987
+msgid "Remove Linux partitions"
+msgstr ""
+
+#: ../libfdisk/gnomefsedit.c:1998
+msgid "Use existing free space"
+msgstr ""
+
 #. workstation or server?
-#: ../libfdisk/gnomefsedit.c:2006
+#: ../libfdisk/gnomefsedit.c:2010
 msgid "Intended Use"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2119
+#: ../libfdisk/gnomefsedit.c:2049
+msgid "Workstation"
+msgstr ""
+
+#: ../libfdisk/gnomefsedit.c:2123
 msgid "Delete RAID Device?"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2120
+#: ../libfdisk/gnomefsedit.c:2124
 msgid "Are you sure you want to remove this RAID device?"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2139 ../libfdisk/newtfsedit.c:1591
+#: ../libfdisk/gnomefsedit.c:2143 ../libfdisk/newtfsedit.c:1597
 msgid "Reset Partition Table"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2141 ../libfdisk/newtfsedit.c:1593
+#: ../libfdisk/gnomefsedit.c:2145 ../libfdisk/newtfsedit.c:1599
 msgid "Reset partition table to original contents? "
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2177 ../libfdisk/gnomefsedit.c:2228
+#: ../libfdisk/gnomefsedit.c:2181 ../libfdisk/gnomefsedit.c:2232
 msgid "<Swap>"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2179
+#: ../libfdisk/gnomefsedit.c:2183
 msgid "<RAID>"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2181
+#: ../libfdisk/gnomefsedit.c:2185
 msgid "<not set>"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2804
+#: ../libfdisk/gnomefsedit.c:2808
 msgid "Partitions"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2848
+#: ../libfdisk/gnomefsedit.c:2852
 msgid "_Add..."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2860
+#: ../libfdisk/gnomefsedit.c:2864
 msgid "_Edit..."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2861
+#: ../libfdisk/gnomefsedit.c:2865
 msgid "_Delete"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2862
+#: ../libfdisk/gnomefsedit.c:2866
 msgid "_Reset"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2892
+#: ../libfdisk/gnomefsedit.c:2896
 msgid "_Make RAID Device"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2901
+#: ../libfdisk/gnomefsedit.c:2905
 msgid "Auto Partition"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:2914
+#: ../libfdisk/gnomefsedit.c:2918
 msgid "Drive Summary"
 msgstr ""
 
@@ -1558,33 +1554,33 @@ msgstr ""
 msgid "Swap Partition"
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1288
+#: ../libfdisk/newtfsedit.c:1294
 msgid "Current Disk Partitions"
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1321
+#: ../libfdisk/newtfsedit.c:1327
 msgid "Drive Summaries"
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1436
+#: ../libfdisk/newtfsedit.c:1442
 msgid "No Root Partition"
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1437
+#: ../libfdisk/newtfsedit.c:1443
 msgid ""
 "You must assign a root (/) partition to a Linux native partition (ext2) for "
 "the install to proceed."
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1457
+#: ../libfdisk/newtfsedit.c:1463
 msgid "No Swap Partition"
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1458
+#: ../libfdisk/newtfsedit.c:1464
 msgid "You must assign a swap partition for the install to proceed."
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1490
+#: ../libfdisk/newtfsedit.c:1496
 msgid ""
 "There are unallocated partitions left. If you quit now they will not be "
 "written to the disk.\n"
@@ -1592,14 +1588,14 @@ msgid ""
 "Are you sure you want to exit?"
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1506
+#: ../libfdisk/newtfsedit.c:1512
 msgid "Save Changes"
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1508
+#: ../libfdisk/newtfsedit.c:1514
 msgid "Save changes to partition table(s)?"
 msgstr ""
 
-#: ../libfdisk/newtfsedit.c:1552
+#: ../libfdisk/newtfsedit.c:1558
 msgid "You may only delete NFS mounts."
 msgstr ""