liveusb: fix vfat UUID

Commit '3577b518715c29175c5f517c6f3cf7a70b0e3d39' fixed the UUID string for
raw images, but broke it for liveusb images. And this patch fixes the issue by
making the liveusb code stop adding a dash to the UUID, because now the dash is
there, just like in UUID of ext4.

Change-Id: Ibfccdf204b301808ef63589dbc3934e517a0212d
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>

diff --git a/mic/imager/liveusb.py b/mic/imager/liveusb.py
index a909928..4cde4a2 100644 (file)
--- a/mic/imager/liveusb.py
+++ b/mic/imager/liveusb.py
@@ -99,8 +99,8 @@ class LiveUSBImageCreator(LiveCDImageCreator):
             if fstype == "vfat" or fstype == "msdos":
                 uuid = usbloop.partitions[0]['mount'].uuid
                 label = usbloop.partitions[0]['mount'].fslabel
-                usblabel = "UUID=%s-%s" % (uuid[0:4], uuid[4:8])
-                overlaysuffix = "-%s-%s-%s" % (label, uuid[0:4], uuid[4:8])
+                usblabel = "UUID=%s" % (uuid)
+                overlaysuffix = "-%s-%s" % (label, uuid)
             else:
                 diskmount = usbloop.partitions[0]['mount']
                 usblabel = "UUID=%s" % diskmount.uuid