[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8184/8267] wic: Update canned-wks for systemd to use UUID everywhere

[Emmanuele Bassi <ebassi src gnome org>]

commit de78322f16b24f1b2dbc6aedac633df268c346a5
Author: Tom Rini <trini konsulko com>
Date:   Thu Sep 21 13:46:17 2017 -0400

    wic: Update canned-wks for systemd to use UUID everywhere
    
    With systemd, the mounting of the swap partition is handled via systemd
    and will mount it, regardless of if PARTUUID is parsed or not.  systemd
    has a runtime dependency on util-linux-mount so PARTUUID for regular
    mount points will be handled correctly.  Make all partitions that we add
    to the image make use of UUIDs for maximum portability.
    
    (From OE-Core rev: 8bf0e3ee85b22fdd4d8940878b4d99cccff1efd5)
    
    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/canned-wks/systemd-bootdisk.wks |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/wic/canned-wks/systemd-bootdisk.wks b/scripts/lib/wic/canned-wks/systemd-bootdisk.wks
index 4bd9d6a..95d7b97 100644
--- a/scripts/lib/wic/canned-wks/systemd-bootdisk.wks
+++ b/scripts/lib/wic/canned-wks/systemd-bootdisk.wks
@@ -2,10 +2,10 @@
 # long-description: Creates a partitioned EFI disk image that the user
 # can directly dd to boot media. The selected bootloader is systemd-boot.
 
-part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active 
--align 1024
+part /boot --source bootimg-efi --sourceparams="loader=systemd-boot" --ondisk sda --label msdos --active 
--align 1024 --use-uuid
 
 part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 --use-uuid
 
-part swap --ondisk sda --size 44 --label swap1 --fstype=swap
+part swap --ondisk sda --size 44 --label swap1 --fstype=swap --use-uuid
 
 bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0"