From 361b890da1c7b24de0a62516545e4c164830081d Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 10 Feb 2017 12:57:13 +0200 Subject: wic: direct: set bootloader.source in the __init__ Moved setting of bootloader source from do_create method to __init__ as it doesn't have anything to do with image creation. Signed-off-by: Ed Bartosh --- scripts/lib/wic/plugins/imager/direct.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 18cd2773d1..64a3368526 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -87,6 +87,13 @@ class DirectPlugin(ImagerPlugin): continue part.realnum = realnum + # as a convenience, set source to the boot partition source + # instead of forcing it to be set via bootloader --source + for part in self.parts: + if not self.ks.bootloader.source and part.mountpoint == "/boot": + self.ks.bootloader.source = part.source + break + def do_create(self): """ Plugin entry point. @@ -160,12 +167,6 @@ class DirectPlugin(ImagerPlugin): self._image = PartitionedImage(image_path, self.ptable_format, self.parts, self.native_sysroot) - for part in self.parts: - # as a convenience, set source to the boot partition source - # instead of forcing it to be set via bootloader --source - if not self.ks.bootloader.source and part.mountpoint == "/boot": - self.ks.bootloader.source = part.source - fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) for part in self.parts: -- cgit v1.2.3