From b46da0731e3f7016d0ab2a67967f07c7e199f219 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 14 Jan 2016 14:12:55 +0200 Subject: wic: adjust code for new data structure New data structure is less nested than old one. Adjusted bootloader and partitions fields: self.ks.handler.bootloader -> self.ks.bootoader self.ks.handler.partitions -> self.ks.partitions Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/plugins/source/bootimg-efi.py | 2 +- scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/lib/wic/plugins/source') diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 5feb79dbf1..556586f322 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -61,7 +61,7 @@ class BootimgEFIPlugin(SourcePlugin): if not custom_cfg: # Create grub configuration using parameters from wks file - options = creator.ks.handler.bootloader.appendLine + bootloader = creator.ks.bootloader grubefi_conf = "" grubefi_conf += "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n" diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 76e7b033fb..4280ff7f3e 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -78,7 +78,7 @@ class RootfsPlugin(SourcePlugin): Called before do_prepare_partition() """ - options = image_creator.ks.handler.bootloader.appendLine + bootloader = image_creator.ks.bootloader syslinux_conf = "" syslinux_conf += "PROMPT 0\n" @@ -97,7 +97,7 @@ class RootfsPlugin(SourcePlugin): syslinux_conf += " KERNEL /boot/bzImage\n" syslinux_conf += " APPEND label=boot root=%s %s\n" % \ - (image_creator.rootdev, options) + (image_creator.rootdev, bootloader.append) syslinux_cfg = os.path.join(image_creator.rootfs_dir['ROOTFS_DIR'], "boot", "syslinux.cfg") msger.debug("Writing syslinux config %s" % syslinux_cfg) -- cgit 1.2.3-korg