diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-03-04 13:44:44 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-03-04 15:37:05 -0500 |
| commit | 9fd282a9e2fb3a63db6b86c5cf07b1fb92e5a9cc (patch) | |
| tree | d71b86eb4edbb90a910cb85966b6f47f3720e687 /booty | |
| parent | 5addce7900be1341f6c22e5bd1af150c07002c95 (diff) | |
| download | anaconda-9fd282a9e2fb3a63db6b86c5cf07b1fb92e5a9cc.tar.gz anaconda-9fd282a9e2fb3a63db6b86c5cf07b1fb92e5a9cc.tar.xz anaconda-9fd282a9e2fb3a63db6b86c5cf07b1fb92e5a9cc.zip | |
Fix passing a device vs. passing a device's name in several more places.
Diffstat (limited to 'booty')
| -rw-r--r-- | booty/alpha.py | 2 | ||||
| -rw-r--r-- | booty/bootloaderInfo.py | 2 | ||||
| -rw-r--r-- | booty/ppc.py | 2 | ||||
| -rw-r--r-- | booty/s390.py | 2 | ||||
| -rw-r--r-- | booty/sparc.py | 2 | ||||
| -rw-r--r-- | booty/x86.py | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/booty/alpha.py b/booty/alpha.py index 03f0653c9..b5ed98a47 100644 --- a/booty/alpha.py +++ b/booty/alpha.py @@ -86,7 +86,7 @@ class alphaBootloaderInfo(bootloaderInfo): if os.path.isfile(instRoot + initrd): f.write(" initrd=%sinitrd%s.img" %(kernelPath, kernelTag)) - realroot = getRootDevName(instRoot+initrd, rootDevice.path) + realroot = getRootDevName(instRoot+initrd, rootDevice) f.write(" root=%s" %(realroot,)) args = self.args.get() diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index dd94f4024..4d5c343cf 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -361,7 +361,7 @@ class bootloaderInfo: sl.addEntry("read-only") append = "%s" %(self.args.get(),) - realroot = getRootDevName(instRoot+initrd, rootDev.path) + realroot = getRootDevName(instRoot+initrd, rootDev) if rootIsDevice(realroot): sl.addEntry("root", rootDev.path) else: diff --git a/booty/ppc.py b/booty/ppc.py index af90ef0bd..d653052ce 100644 --- a/booty/ppc.py +++ b/booty/ppc.py @@ -121,7 +121,7 @@ class ppcBootloaderInfo(bootloaderInfo): append = "%s" %(self.args.get(),) - realroot = getRootDevName(instRoot+initrd, rootDev.path) + realroot = getRootDevName(instRoot+initrd, rootDev) if rootIsDevice(realroot): f.write("\troot=%s\n" %(realroot,)) else: diff --git a/booty/s390.py b/booty/s390.py index 2c3f8a37e..655d028b8 100644 --- a/booty/s390.py +++ b/booty/s390.py @@ -144,7 +144,7 @@ class s390BootloaderInfo(bootloaderInfo): if os.access (instRoot + initrd, os.R_OK): f.write('\tramdisk=%sinitrd%s.img\n' %(self.kernelLocation, kernelTag)) - realroot = getRootDevName(instRoot+initrd, rootDev.path) + realroot = getRootDevName(instRoot+initrd, rootDev) f.write('\tparameters="root=%s' %(realroot,)) if bl.args.get(): f.write(' %s' % (bl.args.get())) diff --git a/booty/sparc.py b/booty/sparc.py index 46c9cdbb7..5ea45eebe 100644 --- a/booty/sparc.py +++ b/booty/sparc.py @@ -62,7 +62,7 @@ class sparcBootloaderInfo(bootloaderInfo): append = "%s" % (self.args.get(),) - realroot = getRootDevName(instRoot+initrd, rootDev.path) + realroot = getRootDevName(instRoot+initrd, rootDev) if rootIsDevice(realroot): f.write("\troot=%s\n" % (realroot,)) else: diff --git a/booty/x86.py b/booty/x86.py index b9c12cdd3..2e01935d3 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -171,7 +171,7 @@ class x86BootloaderInfo(efiBootloaderInfo): f.write("# all kernel and initrd paths are relative " "to /, eg.\n") - bootDevs = self.getPhysicalDevices(bootDev) + bootDevs = self.getPhysicalDevices(bootDev.name) f.write('# root %s\n' % self.grubbyPartitionName(bootDevs[0])) f.write("# kernel %svmlinuz-version ro root=%s\n" % (cfPath, rootDev.path)) @@ -233,7 +233,7 @@ class x86BootloaderInfo(efiBootloaderInfo): f.write('title %s (%s)\n' % (longlabel, version)) f.write('\troot %s\n' % self.grubbyPartitionName(bootDevs[0])) - realroot = getRootDevName(instRoot+initrd, rootDev.path) + realroot = getRootDevName(instRoot+initrd, rootDev) realroot = " root=%s" %(realroot,) if version.endswith("xen0") or (version.endswith("xen") and not os.path.exists("/proc/xen")): @@ -304,7 +304,7 @@ class x86BootloaderInfo(efiBootloaderInfo): except: pass - for dev in self.getPhysicalDevices(rootDev) + bootDevs: + for dev in self.getPhysicalDevices(rootDev.name) + bootDevs: usedDevs[dev] = 1 if os.access(instRoot + "/boot/grub/device.map", os.R_OK): |