On Tue, 2014-06-24 at 16:09 -0700, Brian C. Lane wrote:
Anaconda custom partitioning needs to call setUpBootLoader but at that point the stage1_device setup would fail, so add a flag to skip it so that stage1_drive gets setup without an error being raised.
blivet/__init__.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py index 455b681..f28c32a 100644 --- a/blivet/__init__.py +++ b/blivet/__init__.py @@ -1804,10 +1804,16 @@ class Blivet(object): boot_disks.sort(cmp=self.compareDisks, key=lambda d: d.name) self.bootloader.set_disk_list(boot_disks)
- def setUpBootLoader(self):
def setUpBootLoader(self, early=False): """ Propagate ksdata into BootLoader.
:keyword bool early: Set to True to skip stage1_device setup
^^double space
Do you expect 'early' to affect more things in the code in the future? If not, I'd rather give it "more sincere" name like 'skip_stage1_dev'.
Otherwise both this and the anaconda patch look good to me.