diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/plugins/imager/direct.py | 9 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 12044318e8..a2bc4c4144 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -149,15 +149,6 @@ class DirectPlugin(ImagerPlugin): return updated - def set_bootimg_dir(self, bootimg_dir): - """ - Accessor for bootimg_dir, the actual location used for the source - of the bootimg. Should be set by source plugins (only if they - change the default bootimg source) so the correct info gets - displayed for print_outimage_info(). - """ - self.bootimg_dir = bootimg_dir - def _full_path(self, path, name, extention): """ Construct full file path to a file we generate. """ return os.path.join(path, "%s-%s.%s" % (self.name, name, extention)) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index dd6c920267..95316c80c0 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -187,7 +187,7 @@ class BootimgEFIPlugin(SourcePlugin): if not bootimg_dir: msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") # just so the result notes display it - creator.set_bootimg_dir(bootimg_dir) + creator.bootimg_dir = bootimg_dir staging_kernel_dir = kernel_dir diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 0be2b78e51..e5f6a328ed 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -151,7 +151,7 @@ class BootimgPcbiosPlugin(SourcePlugin): if not _has_syslinux(bootimg_dir): msger.error("Please build syslinux first\n") # just so the result notes display it - creator.set_bootimg_dir(bootimg_dir) + creator.bootimg_dir = bootimg_dir staging_kernel_dir = kernel_dir |