[PATCH] Fix another device vs. string problem in EFI bootloader config (#496669).

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 booty/bootloaderInfo.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
index dfd96d2..de0f920 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
-- 
1.6.1.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux