[blivet/rhel7 1/4] Let setUpBootLoader raise BootloaderError (#1015277)
Brian C. Lane
bcl at redhat.com
Thu Oct 3 23:38:16 UTC 2013
From: "Brian C. Lane" <bcl at redhat.com>
This allows callers to deal with bootloader errors.
Related: rhbz#1015277
---
blivet/__init__.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py
index d15a0d0..083ce78 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -1702,7 +1702,10 @@ class Blivet(object):
self.bootloader.set_disk_list(boot_disks)
def setUpBootLoader(self):
- """ Propagate ksdata into BootLoader. """
+ """ Propagate ksdata into BootLoader.
+
+ :raises: BootloaderError if stage1 setup fails
+ """
if not self.bootloader or not self.ksdata:
log.warning("either ksdata or bootloader data missing")
return
@@ -1713,10 +1716,7 @@ class Blivet(object):
self.bootloader.stage1_disk = self.devicetree.resolveDevice(self.ksdata.bootloader.bootDrive)
self.bootloader.stage2_device = self.bootDevice
- try:
- self.bootloader.set_stage1_device(self.devices)
- except BootLoaderError as e:
- log.debug("failed to set bootloader stage1 device: %s" % e)
+ self.bootloader.set_stage1_device(self.devices)
@property
def bootDisk(self):
--
1.8.3.1
More information about the anaconda-patches
mailing list