[oe-commits] [openembedded-core] 09/23: wic: squashfs does support partition uuid.

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit a849160599a5c29c4db7378d24af1427daf88a4b
Author: Emmanuel Roullit <emmanuel.roullit at gmail.com>
AuthorDate: Thu Sep 6 20:05:52 2018 +0200

    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")
    Signed-off-by: Emmanuel Roullit <emmanuel.roullit at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/wic/ksparser.py | 4 ++--
 1 file 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():
                         raise KickStartError('%s:%d: %s' % \
                                              (confpath, lineno, err))
                     if line.startswith('part'):
-                        # SquashFS does not support UUID
-                        if parsed.fstype == 'squashfs' and parsed.use_uuid:
+                        # SquashFS does not support filesystem UUID
+                        if parsed.fstype == 'squashfs' and parsed.fsuuid:
                             err = "%s:%d: SquashFS does not support UUID" \
                                   % (confpath, lineno)
                             raise KickStartError(err)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.