fix liveusb due to change in dc1873f

Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
mer-tools · Jan 28, 2013 · eba71a7 · eba71a7
1 parent e09036d
commit eba71a7
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/mic/imager/liveusb.py b/mic/imager/liveusb.py
@@ -94,15 +94,10 @@ def _create_usbimg(self, isodir):
                 shutil.copyfile(isodir + "/LiveOS/osmin.img",
                                 usbmnt + "/LiveOS/osmin.img")
 
-            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])
-            else:
-                diskmount = usbloop.partitions[0]['mount']
-                usblabel = "UUID=%s" % diskmount.uuid
-                overlaysuffix = "-%s-%s" % (diskmount.fslabel, diskmount.uuid)
+            uuid = usbloop.partitions[0]['mount'].uuid
+            label = usbloop.partitions[0]['mount'].fslabel
+            usblabel = "UUID=%s" % (uuid)
+            overlaysuffix = "-%s-%s" % (label, uuid)
 
             args = ['cp', "-Rf", isodir + "/isolinux", usbmnt + "/syslinux"]
             rc = runner.show(args)