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

[master] Don't skip biosboot request if no stage1_drive has been chosen.



Otherwise bootloader.stage1_device() later will not detect any suitable
devices because it will find we're using a GPT disk with no biosboot
partitions. That fails sanityCheck().

Resolves: rhbz#734861
---
 pyanaconda/storage/partitioning.py |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py
index 237e55e..601fa58 100644
--- a/pyanaconda/storage/partitioning.py
+++ b/pyanaconda/storage/partitioning.py
@@ -134,19 +134,20 @@ def _schedulePartitions(storage, disks):
             continue
         elif request.fstype == "biosboot" and storage.anaconda:
             boot_disk = storage.anaconda.bootloader.stage1_drive
-            if boot_disk and boot_disk.format.labelType != "gpt":
-                # biosboot is only needed for gpt disklabels on non-efi x86
-                log.info("skipping bios boot request for msdos disklabel")
-                log.debug(request)
-                continue
+            if boot_disk:
+                if boot_disk.format.labelType != "gpt":
+                    # biosboot is only needed for gpt disklabels on non-efi x86
+                    log.info("skipping bios boot request for msdos disklabel")
+                    log.debug(request)
+                    continue
 
-            gpt_check = getattr(storage.anaconda.bootloader,
-                                "_gpt_disk_has_bios_boot",
-                                None)
-            if gpt_check and gpt_check(boot_disk):
-                # there's already a bios boot partition on the gpt boot disk
-                log.info("skipping bios boot request since boot disk has one")
-                continue
+                gpt_check = getattr(storage.anaconda.bootloader,
+                                    "_gpt_disk_has_bios_boot",
+                                    None)
+                if gpt_check and gpt_check(boot_disk):
+                    # there's already a bios boot partition on the gpt boot disk
+                    log.info("skipping bios boot request since boot disk has one")
+                    continue
 
         # This is a little unfortunate but let the backend dictate the rootfstype
         # so that things like live installs can do the right thing
-- 
1.7.6


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