[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8183/8267] wic: When using --use-uuid make sure that we update the fstab with PARTUUID

[Emmanuele Bassi <ebassi src gnome org>]

commit 61f319db679d7d7ab4b87152103f3e2fc7c75244
Author: Tom Rini <trini konsulko com>
Date:   Thu Sep 21 13:46:16 2017 -0400

    wic: When using --use-uuid make sure that we update the fstab with PARTUUID
    
    When we have been told to use the UUID we should also update the fstab
    to make use of PARTUUID instead of hard-coding the device in question.
    This will make the resulting image much more portable.
    
    (From OE-Core rev: 1d1fdcaf8702110783f2003cd3f8ae96c99a6d72)
    
    Signed-off-by: Tom Rini <trini konsulko com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Armin Kuster <akuster mvista com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/imager/direct.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index bdb8385..da1c061 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -140,9 +140,12 @@ class DirectPlugin(ImagerPlugin):
                or part.mountpoint == "/":
                 continue
 
-            # mmc device partitions are named mmcblk0p1, mmcblk0p2..
-            prefix = 'p' if  part.disk.startswith('mmcblk') else ''
-            device_name = "/dev/%s%s%d" % (part.disk, prefix, part.realnum)
+            if part.use_uuid:
+                device_name = "PARTUUID=%s" % part.uuid
+            else:
+                # mmc device partitions are named mmcblk0p1, mmcblk0p2..
+                prefix = 'p' if  part.disk.startswith('mmcblk') else ''
+                device_name = "/dev/%s%s%d" % (part.disk, prefix, part.realnum)
 
             opts = part.fsopts if part.fsopts else "defaults"
             line = "\t".join([device_name, part.mountpoint, part.fstype,