MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

wic: Move validation of --ptable option to wks parser

Browse Source 
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 <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh 2015-06-05 12:54:08 +03:00 committed by Richard Purdie
parent 69bbf80c8d
commit d59d876f44
5 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/lib/wic/kickstart/custom_commands/micboot.py
View File

@ -44,6 +44,7 @@ class Mic_Bootloader(F8_Bootloader):
def _getParser(self):
op = F8_Bootloader._getParser(self)
op.add_option("--menus", dest="menus")
op.add_option("--ptable", dest="ptable", type="string")
op.add_option("--ptable", dest="ptable", choices=("msdos", "gpt"),
default="msdos")
return op

15
scripts/lib/wic/plugins/source/bootimg-efi.py
View File

@ -60,13 +60,8 @@ class BootimgEFIPlugin(SourcePlugin):
kernel = "/bzImage"
if cr.ptable_format in ('msdos', 'gpt'):
rootstr = cr.rootdev
else:
raise ImageError("Unsupported partition table format found")
grubefi_conf += "linux %s root=%s rootwait %s\n" \
% (kernel, rootstr, options)
% (kernel, cr.rootdev, options)
grubefi_conf += "}\n"
msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \
@ -104,16 +99,10 @@ class BootimgEFIPlugin(SourcePlugin):
kernel = "/bzImage"
if cr.ptable_format in ('msdos', 'gpt'):
rootstr = cr.rootdev
else:
raise ImageError("Unsupported partition table format found")
boot_conf = ""
boot_conf += "title boot\n"
boot_conf += "linux %s\n" % kernel
boot_conf += "options LABEL=Boot root=%s %s\n" \
% (rootstr, options)
boot_conf += "options LABEL=Boot root=%s %s\n" % (cr.rootdev, options)
msger.debug("Writing gummiboot config %s/hdd/boot/loader/entries/boot.conf" \
% cr_workdir)

8
scripts/lib/wic/plugins/source/bootimg-pcbios.py
View File

@ -103,12 +103,8 @@ class BootimgPcbiosPlugin(SourcePlugin):
kernel = "/vmlinuz"
syslinux_conf += "KERNEL " + kernel + "\n"
if cr.ptable_format in ('msdos', 'gpt'):
rootstr = cr.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" % \
(cr.rootdev, options)
msger.debug("Writing syslinux config %s/hdd/boot/syslinux.cfg" \
% cr_workdir)

8
scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
View File

@ -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)

4
scripts/lib/wic/utils/partitionedfs.py
View File

@ -122,10 +122,6 @@ class Image(object):
msger.debug("Assigning %s partitions to disks" % ptable_format)
if ptable_format not in ('msdos', 'gpt'):
raise ImageError("Unknown partition table format '%s', supported " \
"formats are: 'msdos'" % ptable_format)
if self._partitions_layed_out:
return