diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-04-20 13:01:23 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-04-21 10:14:15 -0400 |
| commit | 6ff4f774d7ed8934517263b1006e0091ca08785a (patch) | |
| tree | b9e97bef4af9933a7eb90a7ea3a63152f248ee8f /booty | |
| parent | eec06c9ec7fdebb6bca49b7871381feed78a070b (diff) | |
| download | anaconda-6ff4f774d7ed8934517263b1006e0091ca08785a.tar.gz anaconda-6ff4f774d7ed8934517263b1006e0091ca08785a.tar.xz anaconda-6ff4f774d7ed8934517263b1006e0091ca08785a.zip | |
Fix another device vs. string problem in EFI bootloader config (#496669).
Diffstat (limited to 'booty')
| -rw-r--r-- | booty/bootloaderInfo.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index dfd96d29b..de0f92020 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -558,9 +558,9 @@ class efiBootloaderInfo(bootloaderInfo): def addNewEfiEntry(self, instRoot): try: - bootdev = self.storage.fsset.mountpoints["/boot/efi"] - except KeyError: - bootdev = self.storage.devicetree.getDeviceByName("sda1") + bootdev = self.storage.fsset.mountpoints["/boot/efi"].name + except: + bootdev = "sda1" link = "%s%s/%s" % (instRoot, "/etc/", self.configname) if not os.access(link, os.R_OK): @@ -572,7 +572,7 @@ class efiBootloaderInfo(bootloaderInfo): ind = ind - 1 except IndexError: ind = len(bootdev) - 1 - + bootdisk = bootdev[:ind] bootpart = bootdev[ind:] if (bootdisk.startswith('ida/') or bootdisk.startswith('cciss/') or |