summaryrefslogtreecommitdiffstats
path: root/todo.py
diff options
context:
space:
mode:
authorErik Troan <ewt@redhat.com>1999-09-22 22:08:59 +0000
committerErik Troan <ewt@redhat.com>1999-09-22 22:08:59 +0000
commite186eb4479ef969fb64a54bc32c5babf3020f251 (patch)
tree494a1dcafbbd8b790af1db50942645dd0d54ed39 /todo.py
parentae61b51212c7e3cfb489d0c36058299db0bbfe36 (diff)
downloadanaconda-e186eb4479ef969fb64a54bc32c5babf3020f251.tar.gz
anaconda-e186eb4479ef969fb64a54bc32c5babf3020f251.tar.xz
anaconda-e186eb4479ef969fb64a54bc32c5babf3020f251.zip
1) handle RAID on swap
2) lilo on raid partitions
Diffstat (limited to 'todo.py')
-rw-r--r--todo.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/todo.py b/todo.py
index 0bd2aa9c0..7a0db1fda 100644
--- a/todo.py
+++ b/todo.py
@@ -514,7 +514,7 @@ class ToDo:
deviceDict[name] = device
rt = open(file, "w")
- for (mntpoint, device, raidType, makeup) in raid:
+ for (mntpoint, device, fstype, raidType, makeup) in raid:
if createDevices:
isys.makeDevInode(device, devPrefix + '/' + device)
@@ -573,7 +573,7 @@ class ToDo:
w = self.intf.waitWindow(_("Creating"),
_("Creating RAID devices..."))
- for (mntpoint, device, raidType, makeup) in raid:
+ for (mntpoint, device, fsType, raidType, makeup) in raid:
iutil.execWithRedirect ("/usr/sbin/mkraid",
[ 'mkraid', '--really-force', '--configfile',
'/tmp/raidtab', '/tmp/' + device ])
@@ -594,7 +594,7 @@ class ToDo:
args = [ "mke2fs", '/tmp/' + device, '-b', '4096', '-i', '16384' ]
# set up raid options for md devices.
if device[:2] == 'md':
- for (rmnt, rdevice, raidType, makeup) in raid:
+ for (rmnt, rdevice, fsType, raidType, makeup) in raid:
if rdevice == device:
rtype = raidType
rdisks = len (makeup)
@@ -751,7 +751,9 @@ class ToDo:
## elif not self.liloDevice: return
(bootpart, boothd) = self.getLiloOptions()
- if (self.liloDevice == "mbr"):
+ if (type((1,)) == bootpart):
+ (kind, self.liloDevice) = bootpart
+ elif (self.liloDevice == "mbr"):
self.liloDevice = boothd
else:
self.liloDevice = bootpart