From: Artem Bityutskiy <artem.bityutskiy@intel.com>
Date: Mon, 24 Jun 2013 08:30:31 +0000 (+0300)
Subject: VfatDiskMount: do not initialize uuid
X-Git-Tag: 0.20~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83410bc120b1f214401517f00da86c53e9f3d1b2;p=tools%2Fmic.git

VfatDiskMount: do not initialize uuid

Do not try to be too smart and initialize UUID to a time-stamp. This UUID is
later on used form mounting in /etc/fstab (UUID=...), and of course this fails
for VFAT because VfatDiskMount provides a fake UUID.

Instead, make VfatDiskMount provide no UUID at all.

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

diff --git a/mic/utils/fs_related.py b/mic/utils/fs_related.py
index 56b9a4f..67a7dff 100644
--- a/mic/utils/fs_related.py
+++ b/mic/utils/fs_related.py
@@ -560,7 +560,7 @@ class VfatDiskMount(DiskMount):
         DiskMount.__init__(self, disk, mountdir, fstype, rmmountdir)
         self.blocksize = blocksize
         self.fslabel = fslabel.replace("/", "")
-        self.uuid = "%08X" % int(time.time())
+        self.uuid = None
         self.skipformat = skipformat
         self.fsopts = fsopts
         self.fsckcmd = find_binary_path("fsck." + self.fstype)
@@ -571,7 +571,7 @@ class VfatDiskMount(DiskMount):
             return
 
         msger.verbose("Formating %s filesystem on %s" % (self.fstype, self.disk.device))
-        rc = runner.show([self.mkfscmd, "-n", self.fslabel, "-i", self.uuid, self.disk.device])
+        rc = runner.show([self.mkfscmd, "-n", self.fslabel, self.disk.device])
         if rc != 0:
             raise MountError("Error creating %s filesystem on disk %s" % (self.fstype,self.disk.device))