diff options
Diffstat (limited to 'yocto-poky/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py')
| -rw-r--r-- | yocto-poky/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/yocto-poky/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/yocto-poky/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 76e7b033f..3d60e6f0f 100644 --- a/yocto-poky/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/yocto-poky/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -19,7 +19,6 @@ # import os -from wic import kickstart from wic import msger from wic.utils import syslinux from wic.utils import runner @@ -78,15 +77,12 @@ 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" - timeout = kickstart.get_timeout(image_creator.ks) - if not timeout: - timeout = 0 - syslinux_conf += "TIMEOUT " + str(timeout) + "\n" + syslinux_conf += "TIMEOUT " + str(bootloader.timeout) + "\n" syslinux_conf += "ALLOWOPTIONS 1\n" # Derive SERIAL... line from from kernel boot parameters @@ -97,7 +93,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) @@ -144,7 +140,7 @@ class RootfsPlugin(SourcePlugin): real_rootfs_dir = cls._get_rootfs_dir(rootfs_dir) - part.set_rootfs(real_rootfs_dir) + part.rootfs_dir = real_rootfs_dir part.prepare_rootfs(image_creator_workdir, oe_builddir, real_rootfs_dir, native_sysroot) # install syslinux into rootfs partition |