On Tue, Jun 24, 2014 at 03:49:53PM -0400, mulhern wrote:
Resolves: rhbz#791136
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
pyanaconda/bootloader.py | 20 ++++++++++----------
pyanaconda/storage_utils.py | 2 +-
pyanaconda/ui/gui/spokes/custom.py | 9 +++++----
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index c0e34da..41a906f 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1713,16 +1713,9 @@ class EFIGRUB(GRUB2):
ret = self._config_dir.replace('efi/', '')
return "\\" + ret.replace('/', '\\')
- def add_efi_boot_target(self):
- if self.stage1_device.type == "partition":
- boot_disk = self.stage1_device.disk
- 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 = self.stage1_device.parents[0].disk
- boot_part_num = self.stage1_device.parents[0].partedPartition.number
- boot_part_num = str(boot_part_num)
+ def _add_single_efi_boot_target(self, disk):
+ boot_disk = disk.disk
+ boot_part_num = disk.partedPartition.number
This needs to be:
boot_part_num = str(disk.partedPartition.number)
With that change it works fine when tested on my UEFI box.
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)