From 6ff4f774d7ed8934517263b1006e0091ca08785a Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Mon, 20 Apr 2009 13:01:23 -0400 Subject: Fix another device vs. string problem in EFI bootloader config (#496669). --- booty/bootloaderInfo.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'booty/bootloaderInfo.py') 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 -- cgit