basic changes to get new lilo code working

3 files changed, 156 insertions, 158 deletions

diff --git a/lilo.py b/lilo.py
index 708e7cdb7..a21abdba9 100644
--- a/lilo.py
+++ b/lilo.py
@@ -17,8 +17,8 @@ class LiloConfigFile:
 		    s = s + "=" + self.items[n]
 	    s = s + '\n'
 	for image in self.images:
-	    (type, name, cl) = image
-	    s = s + "\n%s=%s\n" % (type, name)
+	    (fsType, name, cl) = image
+	    s = s + "\n%s=%s\n" % (fsType, name)
 	    s = s + cl.__repr__(1)
 	return s
 
@@ -37,23 +37,23 @@ class LiloConfigFile:
 	return self.items[item]
 
     def getImage(self, name):
-        for (type, label, config) in self.images:
+        for (fsType, label, config) in self.images:
             if label == name:
-		return (type, config)
+		return (fsType, config)
 	raise IndexError, "unknown image %s" % (name,)
 
-    def addImage (self, type, name, config):
-	self.images.append((type, name, config))
+    def addImage (self, fsType, name, config):
+	self.images.append((fsType, name, config))
 
     def delImage (self, name):
         for entry in self.images:
-            type, label, config = entry
+            fsType, label, config = entry
             if label == name:
                 self.images.remove (entry)
 
     def listImages (self):
 	l = []
-        for (type, label, config) in self.images:
+        for (fsType, label, config) in self.images:
 	    l.append(label)
 	return l
 
@@ -98,7 +98,7 @@ class LiloConfigFile:
 
     def __init__(self):
 	self.order = []
-	self.images = []		# more (type, name, LiloConfigFile) pair
+	self.images = []		# more (fsType, name, LiloConfigFile) pair
 	self.items = {}
 
 class LiloConfiguration:
@@ -137,7 +137,7 @@ class LiloConfiguration:
 
 	self.liloImages = {}
         foundDos = 0
-	for (dev, devName, type, start, size) in drives:
+	for (dev, devName, fsType, start, size) in drives:
 	    # ext2 and raid partitions get listed if they're / -- we do
 	    # not allow non-mounted partitions to be booted anymore as
 	    # modules are so unlikely to work out as to be not worth
@@ -147,7 +147,7 @@ class LiloConfiguration:
 	    # loadable, but we don't
 
             # only list dos and ext2 partitions
-            if type != 1 and type != 2:
+            if fsType != 1 and fsType != 2:
                 continue
 
 	    if (mountsByDev.has_key(dev)):
@@ -157,7 +157,7 @@ class LiloConfiguration:
 		    else:
 			self.liloImages[dev] = ("linux", 2)
 
-            if type == 1:
+            if fsType == 1:
 		if foundDos: continue
 
 		foundDos = 1
@@ -169,25 +169,38 @@ class LiloConfiguration:
 		    if oldImages.has_key(dev):
 			self.liloImages[dev] = oldImages[dev]
 		    else:
-			self.liloImages[dev] = ("dos", type)
+			self.liloImages[dev] = ("dos", fsType)
 
 	# if there is no default image (self.default is None, or invalid)
 	# set the default image to the liunx partition
 	if self.default:
-	    for (label, type) in self.liloImages.values():
+	    for (label, fsType) in self.liloImages.values():
 		if label == self.default: break
 	    if label != self.default:
 		self.default = None
 
 	if not self.default:
-	    for (label, type) in self.liloImages.values():
-		if type == 2:
+	    for (label, fsType) in self.liloImages.values():
+		if fsType == 2:
 		    self.default = label
 		    break
 
 	return (self.liloImages, self.default)
 
-    def install (self, fstab):
+    def makeInitrd (self, kernelTag, instRoot):
+	initrd = "/boot/initrd%s.img" % (kernelTag, )
+	if not self.initrdsMade.has_key(initrd):
+            iutil.execWithRedirect("/sbin/mkinitrd",
+                                  [ "/sbin/mkinitrd",
+				    "--ifneeded",
+                                    initrd,
+                                    kernelTag[1:] ],
+                                  stdout = None, stderr = None, searchPath = 1,
+                                  root = instRoot)
+	    self.initrdsMade[kernelTag] = 1
+	return initrd
+
+    def install (self, fstab, instRoot, hdList, upgrade):
 	# If self.liloDevice is None, skipping lilo doesn't work
 	if not self.liloDevice: return
 
@@ -199,8 +212,8 @@ class LiloConfiguration:
 	    self.setLiloImages(self.getLiloImages())
 
         # on upgrade read in the lilo config file
-        if os.access (self.instPath + '/etc/lilo.conf', os.R_OK):
-	    lilo.read (self.instPath + '/etc/lilo.conf')
+        if os.access (instRoot + '/etc/lilo.conf', os.R_OK):
+	    lilo.read (instRoot + '/etc/lilo.conf')
 	lilo = LiloConfigFile ()
 
 	# Remove any invalid entries that are in the file; we probably
@@ -210,9 +223,9 @@ class LiloConfiguration:
 	# easily done.
 	imagesByLabel = {}
 	for image in lilo.listImages():
-	    (type, sl) = lilo.getImage(image)
-	    if type == "other": continue
-	    if not os.access(self.instPath + image):
+	    (fsType, sl) = lilo.getImage(image)
+	    if fsType == "other": continue
+	    if not os.access(instRoot + image):
 		lilo.delImage(image)
 	    else:
 		imagesByLabel[sl.getEntry('label')] = image
@@ -236,15 +249,15 @@ class LiloConfiguration:
 	if self.liloLinear:
 	    lilo.addEntry("linear", replace = 0)
 
-	smpInstalled = (self.hdList.has_key('kernel-smp') and 
-                        self.hdList['kernel-smp'].selected)
+	smpInstalled = (hdList.has_key('kernel-smp') and 
+                        hdList['kernel-smp'].selected)
 
 	# This is a bit odd, but old versions of Red Hat could install
 	# SMP kernels on UP systems, but (properly) configure the UP version.
 	# We don't want to undo that, but we do want folks using this install
 	# to be able to override the kernel to use during installs. This rule
 	# seems to nail this.
-	if (self.upgrade and not isys.smpAvailable()):
+	if (upgrade and not isys.smpAvailable()):
 	    smpInstalled = 0
 
         rootDev = fstab.getRootDevice ()
@@ -269,14 +282,14 @@ class LiloConfiguration:
 
 	label = main
 	if (smpInstalled):
-	    kernelList.append((main, self.hdList['kernel-smp'], "smp"))
+	    kernelList.append((main, hdList['kernel-smp'], "smp"))
 	    label = main + "-up"
 
-	kernelList.append((label, self.hdList['kernel'], ""))
+	kernelList.append((label, hdList['kernel'], ""))
 
 	for (label, kernel, tag) in kernelList:
 	    if imagesByLabel.has_key(label):
-		(type, sl) = lilo.getImage(imagesByLabel[label])
+		(fsType, sl) = lilo.getImage(imagesByLabel[label])
 		lilo.delImage(imagesByLabel[label])
 	    else:
 		sl = LiloConfigFile()
@@ -284,10 +297,10 @@ class LiloConfiguration:
 	    kernelTag = "-%s-%s%s" % (kernel['version'], kernel['release'], tag)
 	    kernelFile = "/boot/vmlinuz" + kernelTag
 
-	    initrd = self.makeInitrd (kernelTag)
+	    initrd = self.makeInitrd (kernelTag, instRoot)
 
 	    sl.addEntry("label", label)
-	    if os.access (self.instPath + initrd, os.R_OK):
+	    if os.access (instRoot + initrd, os.R_OK):
 		sl.addEntry("initrd", initrd)
 
 	    sl.addEntry("read-only")
@@ -300,7 +313,7 @@ class LiloConfiguration:
 
 	for (label, device) in otherList:
 	    try:
-		(type, sl) = lilo.getImage(device)
+		(fsType, sl) = lilo.getImage(device)
 		lilo.delImage(device)
 	    except IndexError:
 		sl = LiloConfigFile()
@@ -308,13 +321,11 @@ class LiloConfiguration:
 	    sl.addEntry("label", label)
 	    lilo.addImage ("other", device, sl)
 
-	lilo.write(self.instPath + "/etc/lilo.conf")
+	lilo.write(instRoot + "/etc/lilo.conf")
 
-        # XXX make me "not test mode"
-        if self.setupFilesystems:
-            iutil.execWithRedirect(self.instPath + '/sbin/lilo' ,
-                                   [ "lilo", "-r", self.instPath ],
-                                   stdout = None)
+	iutil.execWithRedirect(instRoot + '/sbin/lilo' ,
+			       [ "lilo", "-r", instRoot ],
+			       stdout = None)
 
     def setDevice(self, device):
 	if (type(device) == type((1,))):
@@ -330,7 +341,7 @@ class LiloConfiguration:
 	self.liloAppend = append
 
     def setDefault(self, default):
-	for (label, type) in self.liloImages.values():
+	for (label, fsType) in self.liloImages.values():
 	    if label == default:
 		self.default = default
 		return
@@ -351,6 +362,7 @@ class LiloConfiguration:
 	self.liloLinear = 1
 	self.liloAppend = None
 	self.default = None
+	self.initrdsMade = {}
 
 
 if __name__ == "__main__":
diff --git a/po/anaconda.pot b/po/anaconda.pot
index 1fe10cda7..21b207d95 100644
--- a/po/anaconda.pot
+++ b/po/anaconda.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-01-20 18:40-0500\n"
+"POT-Creation-Date: 2000-01-28 11:56-0500\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"
@@ -30,8 +30,8 @@ msgstr ""
 #: ../loader/loader.c:886 ../loader/loader.c:1638 ../loader/loader.c:1684
 #: ../loader/loader.c:1755 ../loader/urls.c:70 ../loader/urls.c:79
 #: ../loader/urls.c:86 ../loader/urls.c:223 ../loader/urls.c:228
-#: ../text.py:280 ../text.py:763 ../todo.py:335 ../todo.py:852 ../todo.py:883
-#: ../todo.py:1252
+#: ../text.py:280 ../text.py:763 ../todo.py:335 ../todo.py:664 ../todo.py:695
+#: ../todo.py:1064
 msgid "Error"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 msgid "Error unmounting %s: %s"
 msgstr ""
 
-#: ../fstab.py:335 ../todo.py:492
+#: ../fstab.py:335 ../todo.py:417
 msgid "Creating"
 msgstr ""
 
@@ -88,12 +88,12 @@ msgstr ""
 #: ../text.py:548 ../text.py:585 ../text.py:587 ../text.py:613 ../text.py:616
 #: ../text.py:625 ../text.py:683 ../text.py:684 ../textw/constants.py:10
 #: ../textw/lilo.py:31 ../textw/lilo.py:86 ../textw/lilo.py:93
-#: ../textw/lilo.py:168 ../textw/packages.py:20 ../textw/packages.py:85
-#: ../textw/packages.py:136 ../textw/packages.py:145
+#: ../textw/lilo.py:177 ../textw/packages.py:20 ../textw/packages.py:85
+#: ../textw/packages.py:144 ../textw/packages.py:153
 #: ../textw/partitioning.py:23 ../textw/partitioning.py:63
-#: ../textw/partitioning.py:211 ../textw/partitioning.py:260
+#: ../textw/partitioning.py:214 ../textw/partitioning.py:263
 #: ../textw/silo.py:26 ../textw/silo.py:87 ../textw/silo.py:186
-#: ../textw/timezone.py:63 ../textw/userauth.py:29 ../textw/userauth.py:145
+#: ../textw/timezone.py:66 ../textw/userauth.py:29 ../textw/userauth.py:145
 #: ../textw/userauth.py:176 ../textw/userauth.py:248
 msgid "Back"
 msgstr ""
@@ -169,8 +169,8 @@ msgstr ""
 #: ../loader/urls.c:70 ../loader/urls.c:79 ../loader/urls.c:86
 #: ../loader/urls.c:234 ../text.py:54 ../text.py:56 ../text.py:100
 #: ../text.py:625 ../textw/constants.py:10 ../textw/lilo.py:104
-#: ../textw/lilo.py:117 ../textw/lilo.py:167 ../textw/silo.py:124
-#: ../textw/silo.py:137 ../textw/silo.py:185
+#: ../textw/lilo.py:176 ../textw/silo.py:124 ../textw/silo.py:137
+#: ../textw/silo.py:185
 msgid "Ok"
 msgstr ""
 
@@ -194,8 +194,8 @@ msgstr ""
 msgid "/dev/ttyS3 (COM4 under DOS)"
 msgstr ""
 
-#: ../iw/lilo.py:201 ../iw/silo.py:246 ../text.py:98 ../textw/lilo.py:99
-#: ../textw/lilo.py:158 ../textw/silo.py:119 ../textw/silo.py:176
+#: ../iw/lilo.py:219 ../iw/silo.py:246 ../text.py:98 ../textw/lilo.py:99
+#: ../textw/lilo.py:167 ../textw/silo.py:119 ../textw/silo.py:176
 msgid "Device"
 msgstr ""
 
@@ -220,10 +220,10 @@ msgstr ""
 #: ../text.py:613 ../text.py:683 ../text.py:708 ../text.py:722 ../text.py:742
 #: ../text.py:755 ../text.py:767 ../text.py:962 ../text.py:966 ../text.py:1163
 #: ../textw/lilo.py:30 ../textw/lilo.py:86 ../textw/packages.py:20
-#: ../textw/packages.py:85 ../textw/packages.py:136
-#: ../textw/partitioning.py:211 ../textw/partitioning.py:260
-#: ../textw/partitioning.py:270 ../textw/partitioning.py:278
-#: ../textw/silo.py:25 ../textw/silo.py:87 ../textw/timezone.py:63
+#: ../textw/packages.py:85 ../textw/packages.py:144
+#: ../textw/partitioning.py:214 ../textw/partitioning.py:263
+#: ../textw/partitioning.py:273 ../textw/partitioning.py:281
+#: ../textw/silo.py:25 ../textw/silo.py:87 ../textw/timezone.py:66
 #: ../textw/userauth.py:29 ../textw/userauth.py:43 ../textw/userauth.py:48
 #: ../textw/userauth.py:81 ../textw/userauth.py:92 ../textw/userauth.py:98
 #: ../textw/userauth.py:106 ../textw/userauth.py:115 ../textw/userauth.py:176
@@ -309,7 +309,7 @@ msgstr ""
 #: ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1479
 #: ../libfdisk/newtfsedit.c:1497 ../libfdisk/newtfsedit.c:1582
 #: ../loader/loader.c:603 ../loader/net.c:712 ../text.py:318 ../text.py:517
-#: ../text.py:535 ../text.py:542 ../textw/partitioning.py:172
+#: ../text.py:535 ../text.py:542 ../textw/partitioning.py:175
 msgid "Yes"
 msgstr ""
 
@@ -320,7 +320,7 @@ msgstr ""
 #: ../libfdisk/newtfsedit.c:692 ../libfdisk/newtfsedit.c:1479
 #: ../libfdisk/newtfsedit.c:1497 ../libfdisk/newtfsedit.c:1582
 #: ../loader/net.c:712 ../text.py:318 ../text.py:323 ../text.py:517
-#: ../text.py:535 ../text.py:545 ../textw/partitioning.py:172
+#: ../text.py:535 ../text.py:545 ../textw/partitioning.py:175
 msgid "No"
 msgstr ""
 
@@ -353,9 +353,8 @@ msgstr ""
 #: ../libfdisk/gnomefsedit.c:677 ../libfdisk/gnomefsedit.c:1646
 #: ../libfdisk/gnomefsedit.c:2154 ../libfdisk/newtfsedit.c:463
 #: ../libfdisk/newtfsedit.c:1497 ../loader/devices.c:168
-#: ../loader/loader.c:1747 ../text.py:359 ../text.py:361 ../textw/lilo.py:104
-#: ../textw/lilo.py:122 ../textw/silo.py:124 ../textw/silo.py:142
-#: ../textw/userauth.py:62
+#: ../loader/loader.c:1747 ../text.py:359 ../text.py:361 ../textw/lilo.py:105
+#: ../textw/silo.py:124 ../textw/silo.py:142 ../textw/userauth.py:62
 msgid "Cancel"
 msgstr ""
 
@@ -552,7 +551,7 @@ msgid "Debug"
 msgstr ""
 
 #: ../text.py:979
-msgid "Red Hat Linux (C) 1999 Red Hat, Inc."
+msgid "Red Hat Linux (C) 2000 Red Hat, Inc."
 msgstr ""
 
 #: ../text.py:981
@@ -599,11 +598,11 @@ msgid "SILO Configuration"
 msgstr ""
 
 #: ../text.py:1051 ../textw/lilo.py:33 ../textw/lilo.py:83
-#: ../textw/lilo.py:176
+#: ../textw/lilo.py:185
 msgid "LILO Configuration"
 msgstr ""
 
-#: ../iw/lilo.py:104 ../iw/lilo.py:223 ../iw/silo.py:125 ../iw/silo.py:269
+#: ../iw/lilo.py:123 ../iw/lilo.py:243 ../iw/silo.py:125 ../iw/silo.py:269
 #: ../text.py:1055 ../text.py:1061
 msgid "Partition"
 msgstr ""
@@ -616,7 +615,7 @@ msgstr ""
 msgid "Automatic Partition"
 msgstr ""
 
-#: ../text.py:1063 ../textw/partitioning.py:252
+#: ../text.py:1063 ../textw/partitioning.py:255
 msgid "Root Filesystem Size"
 msgstr ""
 
@@ -640,7 +639,7 @@ msgstr ""
 msgid "Individual Packages"
 msgstr ""
 
-#: ../text.py:1095 ../textw/packages.py:114
+#: ../text.py:1095 ../textw/packages.py:122
 msgid "Package Dependencies"
 msgstr ""
 
@@ -693,97 +692,97 @@ msgstr ""
 msgid "Error copying file: %s"
 msgstr ""
 
-#: ../todo.py:492
+#: ../todo.py:417
 msgid "Creating boot disk..."
 msgstr ""
 
-#: ../todo.py:643
+#: ../todo.py:437
 msgid "Reading"
 msgstr ""
 
-#: ../todo.py:644
+#: ../todo.py:438
 msgid "Reading package information..."
 msgstr ""
 
-#: ../todo.py:822 ../todo.py:835
+#: ../todo.py:634 ../todo.py:647
 msgid "no suggestion"
 msgstr ""
 
-#: ../todo.py:841
+#: ../todo.py:653
 msgid "Searching"
 msgstr ""
 
-#: ../todo.py:842
+#: ../todo.py:654
 msgid "Searching for Red Hat Linux installations..."
 msgstr ""
 
-#: ../todo.py:853 ../todo.py:884
+#: ../todo.py:665 ../todo.py:696
 #, c-format
 msgid "Error mounting ext2 filesystem on %s: %s"
 msgstr ""
 
-#: ../todo.py:895
+#: ../todo.py:707
 msgid "Finding"
 msgstr ""
 
-#: ../todo.py:896
+#: ../todo.py:708
 msgid "Finding packages to upgrade..."
 msgstr ""
 
-#: ../todo.py:1132
+#: ../todo.py:944
 msgid "Processing"
 msgstr ""
 
-#: ../todo.py:1133
+#: ../todo.py:945
 msgid "Preparing to install..."
 msgstr ""
 
-#: ../todo.py:1247
+#: ../todo.py:1059
 msgid "Rebuilding"
 msgstr ""
 
-#: ../todo.py:1248
+#: ../todo.py:1060
 msgid "Rebuilding RPM database..."
 msgstr ""
 
-#: ../todo.py:1253
+#: ../todo.py:1065
 msgid "Rebuild of RPM database failed. You may be out of disk space?"
 msgstr ""
 
-#: ../todo.py:1303
+#: ../todo.py:1115
 #, c-format
 msgid "Upgrading %s.\n"
 msgstr ""
 
-#: ../todo.py:1305
+#: ../todo.py:1117
 #, c-format
 msgid "Installing %s.\n"
 msgstr ""
 
-#: ../todo.py:1326
+#: ../todo.py:1138
 msgid ""
 "You don't appear to have enough disk space to install the packages you've "
 "selected. You need more space on the following filesystems:\n"
 "\n"
 msgstr ""
 
-#: ../todo.py:1329
+#: ../todo.py:1141
 msgid "Mount Point"
 msgstr ""
 
-#: ../todo.py:1329
+#: ../todo.py:1141
 msgid "Space Needed"
 msgstr ""
 
-#: ../todo.py:1342
+#: ../todo.py:1154
 msgid "Disk Space"
 msgstr ""
 
-#: ../todo.py:1366
+#: ../todo.py:1178
 msgid "Post Install"
 msgstr ""
 
-#: ../todo.py:1367
+#: ../todo.py:1179
 msgid "Performing post install configuration..."
 msgstr ""
 
@@ -865,7 +864,7 @@ msgid "Add"
 msgstr ""
 
 #: ../iw/account.py:220 ../libfdisk/newtfsedit.c:1291
-#: ../libfdisk/newtfsedit.c:1299 ../textw/lilo.py:167 ../textw/lilo.py:189
+#: ../libfdisk/newtfsedit.c:1299 ../textw/lilo.py:176 ../textw/lilo.py:198
 #: ../textw/partitioning.py:62 ../textw/silo.py:185 ../textw/silo.py:207
 #: ../textw/userauth.py:176
 msgid "Edit"
@@ -947,15 +946,15 @@ msgstr ""
 msgid "Unresolved Dependencies"
 msgstr ""
 
-#: ../iw/dependencies.py:30 ../iw/progress.py:121 ../textw/packages.py:121
+#: ../iw/dependencies.py:30 ../iw/progress.py:121 ../textw/packages.py:129
 msgid "Package"
 msgstr ""
 
-#: ../iw/dependencies.py:30 ../textw/packages.py:121
+#: ../iw/dependencies.py:30 ../textw/packages.py:129
 msgid "Requirement"
 msgstr ""
 
-#: ../iw/dependencies.py:38 ../textw/packages.py:133
+#: ../iw/dependencies.py:38 ../textw/packages.py:141
 msgid "Install packages to satisfy dependencies"
 msgstr ""
 
@@ -1058,50 +1057,50 @@ msgstr ""
 msgid "Lilo Configuration"
 msgstr ""
 
-#: ../iw/lilo.py:109 ../iw/lilo.py:224 ../iw/silo.py:130 ../iw/silo.py:270
+#: ../iw/lilo.py:126 ../iw/lilo.py:244 ../iw/silo.py:130 ../iw/silo.py:270
 msgid "Type"
 msgstr ""
 
-#: ../iw/lilo.py:144
+#: ../iw/lilo.py:162
 msgid "Install LILO boot record on:"
 msgstr ""
 
-#: ../iw/lilo.py:151 ../iw/silo.py:167 ../textw/silo.py:61
+#: ../iw/lilo.py:169 ../iw/silo.py:167 ../textw/silo.py:61
 msgid "Master Boot Record (MBR)"
 msgstr ""
 
-#: ../iw/lilo.py:155 ../iw/silo.py:170 ../textw/silo.py:62
+#: ../iw/lilo.py:173 ../iw/silo.py:170 ../textw/silo.py:62
 msgid "First sector of boot partition"
 msgstr ""
 
-#: ../iw/lilo.py:159 ../textw/lilo.py:24
+#: ../iw/lilo.py:177 ../textw/lilo.py:24
 msgid "Use linear mode (needed for some SCSI drives)"
 msgstr ""
 
-#: ../iw/lilo.py:169 ../iw/silo.py:197
+#: ../iw/lilo.py:187 ../iw/silo.py:197
 msgid "Kernel parameters"
 msgstr ""
 
-#: ../iw/lilo.py:186 ../iw/silo.py:215
+#: ../iw/lilo.py:204 ../iw/silo.py:215
 msgid "Create boot disk"
 msgstr ""
 
-#: ../iw/lilo.py:190
+#: ../iw/lilo.py:208
 msgid "Do not install LILO"
 msgstr ""
 
-#: ../iw/lilo.py:201 ../iw/silo.py:246 ../textw/lilo.py:158
+#: ../iw/lilo.py:219 ../iw/silo.py:246 ../textw/lilo.py:167
 #: ../textw/silo.py:176
 msgid "Default"
 msgstr ""
 
-#: ../iw/lilo.py:201 ../iw/silo.py:246 ../textw/lilo.py:158
+#: ../iw/lilo.py:219 ../iw/silo.py:246 ../textw/lilo.py:167
 #: ../textw/silo.py:176
 msgid "Partition type"
 msgstr ""
 
-#: ../iw/lilo.py:201 ../iw/lilo.py:235 ../iw/silo.py:246 ../iw/silo.py:281
-#: ../textw/lilo.py:100 ../textw/lilo.py:158 ../textw/silo.py:120
+#: ../iw/lilo.py:219 ../iw/lilo.py:255 ../iw/silo.py:246 ../iw/silo.py:281
+#: ../textw/lilo.py:100 ../textw/lilo.py:167 ../textw/silo.py:120
 #: ../textw/silo.py:176
 msgid "Boot label"
 msgstr ""
@@ -1226,18 +1225,18 @@ msgstr ""
 msgid "Disk Druid"
 msgstr ""
 
-#: ../iw/rootpartition.py:43 ../textw/partitioning.py:167
+#: ../iw/rootpartition.py:43 ../textw/partitioning.py:170
 msgid "Low Memory"
 msgstr ""
 
-#: ../iw/rootpartition.py:44 ../textw/partitioning.py:168
+#: ../iw/rootpartition.py:44 ../textw/partitioning.py:171
 msgid ""
 "As you don't have much memory in this machine, we need to turn on swap space "
 "immediately. To do this we'll have to write your new partition table to the "
 "disk immediately. Is that okay?"
 msgstr ""
 
-#: ../iw/rootpartition.py:114 ../textw/partitioning.py:253
+#: ../iw/rootpartition.py:114 ../textw/partitioning.py:256
 #, c-format
 msgid ""
 "You've chosen to put your root filesystem in a file on an already-existing "
@@ -1254,11 +1253,11 @@ msgstr ""
 msgid "Swap space size:"
 msgstr ""
 
-#: ../iw/rootpartition.py:158 ../textw/partitioning.py:121
+#: ../iw/rootpartition.py:158 ../textw/partitioning.py:124
 msgid "Automatic Partitioning"
 msgstr ""
 
-#: ../iw/rootpartition.py:224 ../textw/partitioning.py:122
+#: ../iw/rootpartition.py:224 ../textw/partitioning.py:125
 #, c-format
 msgid ""
 "%s\n"
@@ -1272,7 +1271,7 @@ msgstr ""
 msgid "Remove data"
 msgstr ""
 
-#: ../iw/rootpartition.py:241 ../textw/partitioning.py:126
+#: ../iw/rootpartition.py:241 ../textw/partitioning.py:129
 msgid "Manually partition"
 msgstr ""
 
@@ -1296,7 +1295,7 @@ msgstr ""
 msgid "Do not install SILO"
 msgstr ""
 
-#: ../iw/timezone.py:30 ../textw/timezone.py:80
+#: ../iw/timezone.py:30 ../textw/timezone.py:83
 msgid "Time Zone Selection"
 msgstr ""
 
@@ -1398,23 +1397,22 @@ msgstr ""
 msgid "Where do you want to install the bootloader?"
 msgstr ""
 
-#: ../textw/lilo.py:104 ../textw/lilo.py:125 ../textw/silo.py:124
-#: ../textw/silo.py:145
+#: ../textw/lilo.py:104 ../textw/silo.py:124 ../textw/silo.py:145
 msgid "Clear"
 msgstr ""
 
-#: ../textw/lilo.py:112 ../textw/silo.py:132
+#: ../textw/lilo.py:113 ../textw/silo.py:132
 msgid "Edit Boot Label"
 msgstr ""
 
-#: ../textw/lilo.py:171 ../textw/silo.py:188
+#: ../textw/lilo.py:180 ../textw/silo.py:188
 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 ""
 
-#: ../textw/packages.py:115
+#: ../textw/packages.py:123
 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 "
@@ -1446,11 +1444,11 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
-#: ../textw/partitioning.py:126 ../textw/partitioning.py:127
+#: ../textw/partitioning.py:129 ../textw/partitioning.py:130
 msgid "Continue"
 msgstr ""
 
-#: ../textw/partitioning.py:187
+#: ../textw/partitioning.py:190
 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 "
@@ -1458,31 +1456,31 @@ msgid ""
 "previous install."
 msgstr ""
 
-#: ../textw/partitioning.py:208
+#: ../textw/partitioning.py:211
 msgid "Check for bad blocks during format"
 msgstr ""
 
-#: ../textw/partitioning.py:213
+#: ../textw/partitioning.py:216
 msgid "Choose Partitions to Format"
 msgstr ""
 
-#: ../textw/partitioning.py:258
+#: ../textw/partitioning.py:261
 msgid "Root filesystem size"
 msgstr ""
 
-#: ../textw/partitioning.py:259
+#: ../textw/partitioning.py:262
 msgid "Swap space"
 msgstr ""
 
-#: ../textw/partitioning.py:268 ../textw/partitioning.py:274
+#: ../textw/partitioning.py:271 ../textw/partitioning.py:277
 msgid "Bad Size"
 msgstr ""
 
-#: ../textw/partitioning.py:269
+#: ../textw/partitioning.py:272
 msgid "The size you enter must be a number."
 msgstr ""
 
-#: ../textw/partitioning.py:275
+#: ../textw/partitioning.py:278
 #, c-format
 msgid ""
 "The total size must be smaller then the amount of free space on the disk, "
@@ -1497,11 +1495,11 @@ msgstr ""
 msgid "Set default PROM boot device"
 msgstr ""
 
-#: ../textw/timezone.py:65
+#: ../textw/timezone.py:68
 msgid "What time zone are you located in?"
 msgstr ""
 
-#: ../textw/timezone.py:77
+#: ../textw/timezone.py:80
 msgid "Hardware clock set to GMT?"
 msgstr ""
 
@@ -2046,46 +2044,46 @@ msgstr ""
 msgid "<not set>"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:3076
+#: ../libfdisk/gnomefsedit.c:3074
 msgid "Unallocated Partitions Exist..."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:3082 ../libfdisk/gnomefsedit.c:3096
+#: ../libfdisk/gnomefsedit.c:3080 ../libfdisk/gnomefsedit.c:3094
 msgid ""
 "You must assign a root (/) partition to a Linux native partition (ext2) or a "
 "RAID partition for the install to proceed."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:3166
+#: ../libfdisk/gnomefsedit.c:3164
 msgid "Partitions"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:3197
+#: ../libfdisk/gnomefsedit.c:3195
 msgid "_Add..."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:3204
+#: ../libfdisk/gnomefsedit.c:3202
 msgid "_Edit..."
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:3205
+#: ../libfdisk/gnomefsedit.c:3203
 msgid "_Reset"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:3210
+#: ../libfdisk/gnomefsedit.c:3208
 msgid "_Delete"
 msgstr ""
 
 #. try having make raid device button available in read-only mode too
-#: ../libfdisk/gnomefsedit.c:3223
+#: ../libfdisk/gnomefsedit.c:3221
 msgid "_Make RAID Device"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:3233
+#: ../libfdisk/gnomefsedit.c:3231
 msgid "Auto Partition"
 msgstr ""
 
-#: ../libfdisk/gnomefsedit.c:3242
+#: ../libfdisk/gnomefsedit.c:3240
 msgid "Drive Summary"
 msgstr ""
 
diff --git a/todo.py b/todo.py
index c4c8a393c..fcb1c96be 100644
--- a/todo.py
+++ b/todo.py
@@ -295,7 +295,6 @@ class ToDo:
 	self.timezone = None
         self.upgrade = 0
 	self.ddruidAlreadySaved = 0
-	self.initrdsMade = {}
         self.initlevel = 3
 	self.expert = expert
         self.progressWindow = None
@@ -398,19 +397,6 @@ class ToDo:
 	f.write(str (self.keyboard))
 	f.close()
 
-    def makeInitrd (self, kernelTag):
-	initrd = "/boot/initrd%s.img" % (kernelTag, )
-	if not self.initrdsMade.has_key(initrd):
-            iutil.execWithRedirect("/sbin/mkinitrd",
-                                  [ "/sbin/mkinitrd",
-				    "--ifneeded",
-                                    initrd,
-                                    kernelTag[1:] ],
-                                  stdout = None, stderr = None, searchPath = 1,
-                                  root = self.instPath)
-	    self.initrdsMade[kernelTag] = 1
-	return initrd
-
     def needBootdisk (self):
 	if self.bootdisk or self.fstab.rootOnLoop(): return 1
 
@@ -428,7 +414,6 @@ class ToDo:
 	kernel = self.hdList['kernel']
         kernelTag = "-%s-%s" % (kernel['version'], kernel['release'])
 
-        self.makeInitrd (kernelTag)
         w = self.intf.waitWindow (_("Creating"), _("Creating boot disk..."))
 	self.setFdDevice ()
         rc = iutil.execWithRedirect("/sbin/mkbootdisk",
@@ -1231,14 +1216,17 @@ class ToDo:
 	    iutil.execWithRedirect(argv[0], argv, root = self.instPath,
 				   stdout = devnull)
         
-        if arch == "sparc":
-            self.silo.installSilo ()
-        elif arch == "i386":
-            self.lilo.install (self.fstab)
-        elif arch == "alpha":
-            self.milo.write ()
-        else:
-            raise RuntimeError, "What kind of machine is this, anyway?!"
+        # XXX make me "not test mode"
+        if self.setupFilesystems:
+	    if arch == "sparc":
+		self.silo.installSilo ()
+	    elif arch == "i386":
+		self.lilo.install (self.fstab, self.instPath, self.hdList, 
+				   self.upgrade)
+	    elif arch == "alpha":
+		self.milo.write ()
+	    else:
+		raise RuntimeError, "What kind of machine is this, anyway?!"
 
 	if self.instClass.postScript:
 	    scriptRoot = "/"