diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-06-05 12:54:08 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:59:13 +0100 |
commit | d59d876f447c961149763e585c012ac2f0f7b788 (patch) | |
tree | 6d12fe19eff3a1f1212196b319d6f3a9fe887775 /scripts/lib/wic/plugins/source/bootimg-efi.py | |
parent | 69bbf80c8df21f93e294d21bf76ad3d0106a43e9 (diff) | |
download | poky-d59d876f447c961149763e585c012ac2f0f7b788.tar.gz |
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 <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-efi.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 39ce9f375e..d3b8468c7b 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -60,13 +60,8 @@ class BootimgEFIPlugin(SourcePlugin): | |||
60 | 60 | ||
61 | kernel = "/bzImage" | 61 | kernel = "/bzImage" |
62 | 62 | ||
63 | if cr.ptable_format in ('msdos', 'gpt'): | ||
64 | rootstr = cr.rootdev | ||
65 | else: | ||
66 | raise ImageError("Unsupported partition table format found") | ||
67 | |||
68 | grubefi_conf += "linux %s root=%s rootwait %s\n" \ | 63 | grubefi_conf += "linux %s root=%s rootwait %s\n" \ |
69 | % (kernel, rootstr, options) | 64 | % (kernel, cr.rootdev, options) |
70 | grubefi_conf += "}\n" | 65 | grubefi_conf += "}\n" |
71 | 66 | ||
72 | msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \ | 67 | msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \ |
@@ -104,16 +99,10 @@ class BootimgEFIPlugin(SourcePlugin): | |||
104 | 99 | ||
105 | kernel = "/bzImage" | 100 | kernel = "/bzImage" |
106 | 101 | ||
107 | if cr.ptable_format in ('msdos', 'gpt'): | ||
108 | rootstr = cr.rootdev | ||
109 | else: | ||
110 | raise ImageError("Unsupported partition table format found") | ||
111 | |||
112 | boot_conf = "" | 102 | boot_conf = "" |
113 | boot_conf += "title boot\n" | 103 | boot_conf += "title boot\n" |
114 | boot_conf += "linux %s\n" % kernel | 104 | boot_conf += "linux %s\n" % kernel |
115 | boot_conf += "options LABEL=Boot root=%s %s\n" \ | 105 | boot_conf += "options LABEL=Boot root=%s %s\n" % (cr.rootdev, options) |
116 | % (rootstr, options) | ||
117 | 106 | ||
118 | msger.debug("Writing gummiboot config %s/hdd/boot/loader/entries/boot.conf" \ | 107 | msger.debug("Writing gummiboot config %s/hdd/boot/loader/entries/boot.conf" \ |
119 | % cr_workdir) | 108 | % cr_workdir) |