[PATCH 5/5] Add support for --noformat too.

[Chris Lumens <clumens redhat com>]

---
 storage/__init__.py |   18 ++++++++++++------
 storage/devices.py  |   22 +++++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/storage/__init__.py b/storage/__init__.py
index 94b598a..db7c507 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -980,7 +980,6 @@ class Storage(object):
 
         # the various partitioning commands
         dict = {}
-        ordering = []
         actions = filter(lambda x: x.device.format.type != "luks",
                          self.devicetree.findActions(type="create"))
 
@@ -989,12 +988,19 @@ class Storage(object):
                 dict[action.device.path].append(action)
             else:
                 dict[action.device.path] = [action]
-                ordering.append(action.device.path)
 
-        for path in ordering:
-            for device in map(lambda x: x.device, dict[path]):
-                device.writeKS(f, preexisting=useExisting(dict[path]))
-                f.write("\n")
+        for device in self.devices:
+            # If there's no action for the given device, it must be one
+            # we are reusing.
+            if not dict.has_key(device.path):
+                noformat = True
+                preexisting = True
+            else:
+                noformat = False
+                preexisting = useExisting(dict[device.path])
+
+            device.writeKS(f, preexisting=preexisting, noformat=noformat)
+            f.write("\n")
 
         self.iscsi.writeKS(f)
         self.zfcp.writeKS(f)
diff --git a/storage/devices.py b/storage/devices.py
index 7310055..c847fdd 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -233,7 +233,7 @@ class Device(object):
               "descr": self.description, "status": self.status})
         return s
 
-    def writeKS(self, f, preexisting=False, s=None):
+    def writeKS(self, f, preexisting=False, noformat=False, s=None):
         return
 
     def removeChild(self):
@@ -962,7 +962,7 @@ class PartitionDevice(StorageDevice):
                "partedPart": self.partedPartition, "disk": self.disk})
         return s
 
-    def writeKS(self, f, preexisting=False, s=None):
+    def writeKS(self, f, preexisting=False, noformat=False, s=None):
         args = []
 
         if self.isExtended:
@@ -981,6 +981,8 @@ class PartitionDevice(StorageDevice):
                 args.append("--ondisk=%s" % self.req_disks[0])
             else:
                 args.append("--onpart=%s" % self.name)
+        if noformat:
+            args.append("--noformat")
 
         f.write("#part ")
         self.format.writeKS(f)
@@ -1453,8 +1455,8 @@ class LUKSDevice(DMCryptDevice):
                                parents=parents, sysfsPath=sysfsPath,
                                uuid=None, exists=exists)
 
-    def writeKS(self, f, preexisting=False, s=None):
-        self.slave.writeKS(f, preexisting=preexisting)
+    def writeKS(self, f, preexisting=False, noformat=False, s=None):
+        self.slave.writeKS(f, preexisting=preexisting, noformat=noformat, s=s)
         self.format.writeKS(f)
         if s:
             f.write(" %s" % s)
@@ -1607,7 +1609,7 @@ class LVMVolumeGroupDevice(DMDevice):
                "freeExtents": self.freeExtents, "pvs": self.pvs, "lvs": self.lvs})
         return s
 
-    def writeKS(self, f, preexisting=False, s=None):
+    def writeKS(self, f, preexisting=False, noformat=False, s=None):
         args = ["--pesize=%s" % self.peSize]
         pvs = []
 
@@ -1616,6 +1618,8 @@ class LVMVolumeGroupDevice(DMDevice):
 
         if preexisting:
             args.append("--useexisting")
+        if noformat:
+            args.append("--noformat")
 
         f.write("#volgroup %s %s %s" % (self.name, " ".join(args), " ".join(pvs)))
         if s:
@@ -1987,7 +1991,7 @@ class LVMLogicalVolumeDevice(DMDevice):
               {"vgdev": self.vg, "percent": self.req_percent})
         return s
 
-    def writeKS(self, f, preexisting=False, s=None):
+    def writeKS(self, f, preexisting=False, noformat=False, s=None):
         args = ["--name=%s" % self.lvname,
                 "--vgname=%s "% self.vg.name]
 
@@ -2004,6 +2008,8 @@ class LVMLogicalVolumeDevice(DMDevice):
 
         if preexisting:
             args.append("--useexisting")
+        if noformat:
+            args.append("--noformat")
 
         f.write("#logvol ")
         self.format.writeKS(f)
@@ -2244,7 +2250,7 @@ class MDRaidArrayDevice(StorageDevice):
                "memberDevices": self.memberDevices, "totalDevices": self.totalDevices})
         return s
 
-    def writeKS(self, f, preexisting=False, s=None):
+    def writeKS(self, f, preexisting=False, noformat=False, s=None):
         args = ["--level=%s" % self.level,
                 "--device=%s" % self.name]
         mems = []
@@ -2253,6 +2259,8 @@ class MDRaidArrayDevice(StorageDevice):
             args.append("--spares=%s" % self.spares)
         if preexisting:
             args.append("--useexisting")
+        if noformat:
+            args.append("--noformat")
 
         for mem in self.parents:
             mems.append("raid.%s" % mem.format.uuid)
-- 
1.6.1.3