diff options
author | Tom Rini <trini@konsulko.com> | 2017-12-13 22:20:25 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 18:03:58 +0000 |
commit | 9ebc8301965b6b0aedc1d0cb8a9bc3e4893f2592 (patch) | |
tree | 60259eec51fd4c61f1cb04fa3203a9412bf2ff28 /scripts/lib/wic/plugins/source | |
parent | 20748d8ddcd41c5c6897d1a711cf157ab1080f9a (diff) | |
download | poky-9ebc8301965b6b0aedc1d0cb8a9bc3e4893f2592.tar.gz |
wic: Introduce --fsuuid and have --use-uuid make use of UUID too
First, allow for wic to be given a filesystem UUID to be used when
creating a filesystem. When not provided, wic will generate the UUID to
be used. Next, when --use-uuid is passed, we update the fstab to mount
things via UUID (and if not found, then use PARTUUID) as UUID is more
portable.
(From OE-Core rev: 9256b8799495634ee8aee5d16ff71bd6e6e25ed4)
Signed-off-by: Tom Rini <trini@konsulko.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')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 3 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 4c4f36a32f..beb74d7a71 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -240,7 +240,8 @@ class BootimgEFIPlugin(SourcePlugin): | |||
240 | # dosfs image, created by mkdosfs | 240 | # dosfs image, created by mkdosfs |
241 | bootimg = "%s/boot.img" % cr_workdir | 241 | bootimg = "%s/boot.img" % cr_workdir |
242 | 242 | ||
243 | dosfs_cmd = "mkdosfs -n efi -C %s %d" % (bootimg, blocks) | 243 | dosfs_cmd = "mkdosfs -n efi -i %s -C %s %d" % \ |
244 | (part.fsuuid, bootimg, blocks) | ||
244 | exec_native_cmd(dosfs_cmd, native_sysroot) | 245 | exec_native_cmd(dosfs_cmd, native_sysroot) |
245 | 246 | ||
246 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) | 247 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) |
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 56da468fb5..d599112dd7 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -186,7 +186,8 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
186 | # dosfs image, created by mkdosfs | 186 | # dosfs image, created by mkdosfs |
187 | bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno) | 187 | bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno) |
188 | 188 | ||
189 | dosfs_cmd = "mkdosfs -n boot -S 512 -C %s %d" % (bootimg, blocks) | 189 | dosfs_cmd = "mkdosfs -n boot -i %s -S 512 -C %s %d" % \ |
190 | (part.fsuuid, bootimg, blocks) | ||
190 | exec_native_cmd(dosfs_cmd, native_sysroot) | 191 | exec_native_cmd(dosfs_cmd, native_sysroot) |
191 | 192 | ||
192 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) | 193 | mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) |