Add comment before UUID string in fstab.

pym/cl_fill_install.py

@@ -442,7 +442,8 @@ class fillVars(object, glob_attr):
                                         zip(self.Get('os_install_disk_use'),
                                         self.Get('os_install_disk_mount'),
                                         self.Get('os_install_disk_format'),
-                                        self.Get('os_install_disk_options'))),
+                                        self.Get('os_install_disk_options'),
+                                        self.Get('os_disk_dev'))),
                                  lambda x,y: cmp(self.separateDevice(x[1]),
                                                  self.separateDevice(y[1])))
         if self.Get('os_install_scratch') == "on":
@@ -450,10 +451,10 @@ class fillVars(object, glob_attr):
 
         # rootLine one string, but it correct work if devicesForFstab is empty
         rootLine =  "\n".join(map(lambda x: "%s\t%s\t%s\t%s\t0 2" %
-                                        (x[0],x[1],x[2],x[3]),
+                                (self._comment(x[0],x[1],x[4]),x[1],x[2],x[3]),
                                         devicesForFstab[:1]))
         otherLines = "\n".join(map(lambda x: "%s\t%s\t%s\t%s\t0 0" %
-                                        (x[0],x[1],x[2],x[3]),
+                                (self._comment(x[0],x[1],x[4]),x[1],x[2],x[3]),
                                         devicesForFstab[1:]))
 
         bindData = zip(self.Get('os_install_bind_path'),
@@ -520,12 +521,20 @@ class fillVars(object, glob_attr):
                         #retList.append('modules_%s=( "!plug" )'%dev)
         #return "\n".join(retList)
 
+    def _comment(self,s,mp,dev):
+            if s.startswith("UUID"):
+                return "# %s was on %s during installation\n%s" % (mp,dev,s)
+            else:
+                return s
+
     def get_os_install_fstab_swap_conf(self):
         """Information about swap for fstab"""
-        return "\n".join(map(lambda x: "%s\tnone\tswap\tsw\t0 0"%x[0],
+        return "\n".join(map(lambda x: "%s\tnone\tswap\tsw\t0 0"%\
+                                    self._comment(x[0],"swap",x[2]),
                                 filter(lambda x: x[1] == "swap",
                                     zip(self.Get('os_install_disk_use'),
-                                        self.Get('os_install_disk_mount')))))
+                                        self.Get('os_install_disk_mount'),
+                                        self.Get('os_disk_dev')))))
 
     def get_os_install_linux_system(self):
         """Get linux system (server or desktop)"""