From d59d876f447c961149763e585c012ac2f0f7b788 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 5 Jun 2015 12:54:08 +0300 Subject: wic: Move validation of --ptable option to wks parser bootloader --ptable option has two valid choices: gpt and msdos Moved this check to wks parser by changing option type to 'choice'. Removed similar checks from 5 other places. (From OE-Core rev: b812d0f40423bc56394cc8b6fc92eb1f477dba1b) Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py') diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 90dac05dca..533eaa7bd1 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -100,12 +100,8 @@ class RootfsPlugin(SourcePlugin): syslinux_conf += "LABEL linux\n" syslinux_conf += " KERNEL /boot/bzImage\n" - if image_creator.ptable_format in ('msdos', 'gpt'): - rootstr = image_creator.rootdev - else: - raise ImageError("Unsupported partition table format found") - - syslinux_conf += " APPEND label=boot root=%s %s\n" % (rootstr, options) + syslinux_conf += " APPEND label=boot root=%s %s\n" % \ + (image_creator.rootdev, options) syslinux_cfg = os.path.join(image_creator.rootfs_dir['ROOTFS_DIR'], "boot", "syslinux.cfg") msger.debug("Writing syslinux config %s" % syslinux_cfg) -- cgit v1.2.3-54-g00ecf