summaryrefslogtreecommitdiffstats
path: root/meta-selftest
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-12-13 22:20:26 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-18 18:03:58 +0000
commitd0de33c5d4c33a212e6ae9d312f780dc7526332a (patch)
tree497d13034c67425f662414549b8c6849ddc2da7f /meta-selftest
parent9ebc8301965b6b0aedc1d0cb8a9bc3e4893f2592 (diff)
downloadpoky-d0de33c5d4c33a212e6ae9d312f780dc7526332a.tar.gz
meta-selftest: wic: Add test for --use-uuid / --fsuuid
- Mount a '/media' partition to wic-image-minimal.wks with a known UUID. - In test_qemu, sort our output from checking the output of 'mount' as it may not be stable. Also, do not check the exit code as passing any output to cut ensures a 0 exit code. - Check for a 'UUID=' line in /etc/fstab with out expected output. (From OE-Core rev: 6d9396b26218f3234701944f385d5c36face8121) 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 'meta-selftest')
-rw-r--r--meta-selftest/recipes-test/images/wic-image-minimal.wks1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.wks b/meta-selftest/recipes-test/images/wic-image-minimal.wks
index 9410b684be..ae69cb6e3c 100644
--- a/meta-selftest/recipes-test/images/wic-image-minimal.wks
+++ b/meta-selftest/recipes-test/images/wic-image-minimal.wks
@@ -4,6 +4,7 @@
4 4
5part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 5part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024
6part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid 6part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
7part /media --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label uuid-test --align 1024 --use-uuid --fsuuid 2c71ef06-a81d-4735-9d3a-379b69c6bdba
7part /mnt --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label core --align 1024 8part /mnt --source rootfs --rootfs-dir=wic-image-minimal --ondisk sda --fstype=ext4 --label core --align 1024
8 9
9bootloader --ptable gpt --timeout=0 --append="rootwait console=tty0" 10bootloader --ptable gpt --timeout=0 --append="rootwait console=tty0"