summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEmmanuel Roullit <emmanuel.roullit@gmail.com>2018-09-06 18:05:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-11 08:05:35 (GMT)
commitcfadccd7e26152b38b16635923421de1fef76ff1 (patch)
tree73187676037860f1355577c179679eb73317c363 /scripts
parentb141ea4bd86bb08d0d27b87d8e54eac686c5fc75 (diff)
downloadpoky-cfadccd7e26152b38b16635923421de1fef76ff1.tar.gz
wic: squashfs does support partition uuid.
wic allows the user to create disk image and reference each created partitions via its partition UUID. squashfs does not support filesystem UUID but it does offer support for partition UUID. $ lsblk -o NAME,FSTYPE,UUID,PARTUUID NAME FSTYPE UUID PARTUUID sda |-sda1 vfat 6078-ACD0 95aa4ffb-741d-4d99-adf6-0358bc890046 |-sda2 squashfs 7d46da2d-29cc-4d5a-9e39-d0381c4abb0c |-sda3 squashfs d4a3e24e-410a-4f2c-8ad5-8f8321de177b |-sda4 ext4 d72ec529-78e4-4cd3-b39b-781b6b1cb47c f3edc990-f4f6-4536-9587-44dae4ceb99f `-sda5 ext4 a0b265aa-e935-40b8-9c6b-e9e58ad3890f 6e72ebaa-29ed-41cd-844c-3f76976cf41d Modifying this constrain allows a user to create squashfs-based rootfs and boot from them with such kernel argument 'root=PARTUUID=7d46da2d-29cc-4d5a-9e39-d0381c4abb0c' Fixes: 2fbdcf4e59c8 ("wic: kparser.py: Check for SquashFS and use-uuid") (From OE-Core rev: a8787bbfdf088b0ef9feb8e6b4230b743bb4086f) Signed-off-by: Emmanuel Roullit <emmanuel.roullit@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/ksparser.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index e590b2f..a5d2918 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -196,8 +196,8 @@ class KickStart():
196 raise KickStartError('%s:%d: %s' % \ 196 raise KickStartError('%s:%d: %s' % \
197 (confpath, lineno, err)) 197 (confpath, lineno, err))
198 if line.startswith('part'): 198 if line.startswith('part'):
199 # SquashFS does not support UUID 199 # SquashFS does not support filesystem UUID
200 if parsed.fstype == 'squashfs' and parsed.use_uuid: 200 if parsed.fstype == 'squashfs' and parsed.fsuuid:
201 err = "%s:%d: SquashFS does not support UUID" \ 201 err = "%s:%d: SquashFS does not support UUID" \
202 % (confpath, lineno) 202 % (confpath, lineno)
203 raise KickStartError(err) 203 raise KickStartError(err)