Attachment 610093 Details for Bug 853308 – Patch to address the problem

[patch] Patch to address the problem

fix-efigrub.patch (text/plain), 4.47 KB, created by Peter Jones on 2012-09-05 16:44:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Jones

Created: 2012-09-05 16:44:01 UTC

Size: 4.47 KB

patch

obsolete

>commit 2b3bec2919522682cf3f23175c5f739a36f935e7
>Author: Peter Jones <pjones@redhat.com>
>Date:   Wed Sep 5 12:17:49 2012 -0400
>
>    Don't depend on storage or instClass in EFIGRUB
>    
>    Resolves: rhbz#853308
>
>diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
>index 21f3edd..b4a861b 100644
>--- a/pyanaconda/bootloader.py
>+++ b/pyanaconda/bootloader.py
>@@ -1551,10 +1551,11 @@ class EFIGRUB(GRUB2):
> 
>     @property
>     def _config_dir(self):
>-        return "efi/EFI/%s" % (self.storage.anaconda.instClass.efi_dir,)
>+        return "efi/EFI/%s" % (self.efi_dir,)
> 
>     def __init__(self, platform=None):
>         super(EFIGRUB, self).__init__(platform=platform)
>+        self.efi_dir = 'BOOT'
> 
>     def efibootmgr(self, *args, **kwargs):
>         if kwargs.pop("capture", False):
>@@ -2138,7 +2139,7 @@ def writeSysconfigKernel(storage, version):
>     f.write("DEFAULTKERNEL=%s\n" % kernel)
>     f.close()
> 
>-def writeBootLoader(storage, payload):
>+def writeBootLoader(storage, payload, instClass):
>     """ Write bootloader configuration to disk.
> 
>         When we get here, the bootloader will already have a default linux
>@@ -2171,6 +2172,8 @@ def writeBootLoader(storage, payload):
>                                          short=base_short_label)
>     storage.bootloader.add_image(default_image)
>     storage.bootloader.default = default_image
>+    if hasattr(storage.bootloader, 'efi_dir'):
>+        storage.bootloader.efi_dir = instClass.efi_dir
> 
>     # write out /etc/sysconfig/kernel
>     writeSysconfigKernel(storage, version)
>diff --git a/pyanaconda/install.py b/pyanaconda/install.py
>index d639df3..36f4831 100644
>--- a/pyanaconda/install.py
>+++ b/pyanaconda/install.py
>@@ -76,7 +76,7 @@ def doInstall(storage, payload, ksdata, instClass):
> 
>     # Do bootloader.
>     with progress_report(_("Installing bootloader")):
>-        writeBootLoader(storage, payload)
>+        writeBootLoader(storage, payload, instClass)
> 
>     # Now run the execute methods of ksdata that require an installed system
>     # to be present first.
>
>commit d691a0f78dd134985fc630d1553a275201fddecc
>Author: Peter Jones <pjones@redhat.com>
>Date:   Wed Sep 5 11:51:04 2012 -0400
>
>    [EFIGRUB] Use self.stage1_device where appropriate.
>    
>    Related: rhbz#853308
>
>diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
>index f0c1ac2..21f3edd 100644
>--- a/pyanaconda/bootloader.py
>+++ b/pyanaconda/bootloader.py
>@@ -1595,15 +1595,14 @@ class EFIGRUB(GRUB2):
>         return ret.replace('/', '\\')
> 
>     def add_efi_boot_target(self):
>-        boot_efi = self.storage.mountpoints["/boot/efi"]
>-        if boot_efi.type == "partition":
>+        if self.stage1_device.type == "partition":
>             boot_disk = boot_efi.disk
>-            boot_part_num = boot_efi.partedPartition.number
>-        elif boot_efi.type == "mdarray":
>+            boot_part_num = self.stage1_device.partedPartition.number
>+        elif self.stage1_device.type == "mdarray":
>             # FIXME: I'm just guessing here. This probably needs the full
>             #        treatment, ie: multiple targets for each member.
>-            boot_disk = boot_efi.parents[0].disk
>-            boot_part_num = boot_efi.parents[0].partedPartition.number
>+            boot_disk = self.stage1_device.parents[0].disk
>+            boot_part_num = self.stage1_device.parents[0].partedPartition.number
>         boot_part_num = str(boot_part_num)
> 
>         rc = self.efibootmgr("-c", "-w", "-L", productName,
>
>commit 0b123637f0af1be0b0b940b2efa1fcb9b57f9797
>Author: Peter Jones <pjones@redhat.com>
>Date:   Wed Sep 5 11:48:49 2012 -0400
>
>    Make sure EFIGRUB and MacEFIGRUB are initialized correctly.
>
>diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
>index 04b4066..f0c1ac2 100644
>--- a/pyanaconda/bootloader.py
>+++ b/pyanaconda/bootloader.py
>@@ -1553,6 +1553,9 @@ class EFIGRUB(GRUB2):
>     def _config_dir(self):
>         return "efi/EFI/%s" % (self.storage.anaconda.instClass.efi_dir,)
> 
>+    def __init__(self, platform=None):
>+        super(EFIGRUB, self).__init__(platform=platform)
>+
>     def efibootmgr(self, *args, **kwargs):
>         if kwargs.pop("capture", False):
>             exec_func = iutil.execWithCapture
>@@ -1636,6 +1639,9 @@ class EFIGRUB(GRUB2):
> 
> 
> class MacEFIGRUB(EFIGRUB):
>+    def __init__(self, platform=None):
>+        super(MacEFIGRUB, self).__init__(platform=platform)
>+
>     def mactel_config(self):
>         if os.path.exists(ROOT_PATH + "/usr/libexec/mactel-boot-setup"):
>             rc = iutil.execWithRedirect("/usr/libexec/mactel-boot-setup", [],

Actions: View | Diff

Attachments on bug 853308: 608354 | 608355 | 608356 | 608357 | 608358 | 608359 | 608360 | 608361 | 608362 | 608363 | 608364 | 608365 | 608366 | 610093 | 610095