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

[PATCH f14-branch master] Fix EFI bootloader install problems (#635873, #635887)



product.py is under pyanaconda, so import from there.
getDiskPart() was changed to use just the device, no need to pass
storage to it.

Resolves: rhbz#635873
Resolves: rhbz#635887
---
 pyanaconda/booty/x86.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/booty/x86.py b/pyanaconda/booty/x86.py
index 93c0a59..a396283 100644
--- a/pyanaconda/booty/x86.py
+++ b/pyanaconda/booty/x86.py
@@ -281,10 +281,10 @@ class x86BootloaderInfo(efiBootloaderInfo):
         f.write("#boot=/dev/%s\n" % (grubTarget))
 
         if iutil.isEfi():
-            from product import productName
+            from pyanaconda.product import productName
             # Map the target device to the full EFI path
             if self.getEfiProductPath(productName):
-                (n, pn) = getDiskPart(bootDevs[0], self.storage)
+                (n, pn) = getDiskPart(bootDevs[0])
                 f.write("device (%s) %s\n" % (self.grubbyDiskName(n), self.getEfiProductPath(productName)))
 
         # get the default image to boot... we have to walk and find it
-- 
1.7.2.3


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