we need to move the lvs to the new vg id if it changes due to kickstart

preexisting stuff

2 files changed, 18 insertions, 5 deletions

diff --git a/autopart.py b/autopart.py
index 8ad5fcec2..70ef200ac 100644
--- a/autopart.py
+++ b/autopart.py
@@ -1222,6 +1222,7 @@ def doAutoPartition(dir, diskset, partitions, intf, instClass, dispatch):
                                     custom_icon='error')
                  sys.exit(0)
 
+            oldid = None
             # now go through and set things from the request to the
             # preexisting partition's request... ladeda
             if request.physicalVolumes:
@@ -1229,11 +1230,20 @@ def doAutoPartition(dir, diskset, partitions, intf, instClass, dispatch):
             if request.pesize:
                 req.pesize = request.pesize
             if request.uniqueID:  # for raid to work
+                oldid = req.uniqueID
                 req.uniqueID = request.uniqueID
             if not request.format:
                 req.format = 0
             else:
                 req.format = 1
+
+            # we also need to go through and remap everything which we
+            # previously found to our new id.  yay!
+            if oldid is not None:
+                for lv in partitions.getLVMLVForVGID(oldid):
+                    lv.volumeGroup = req.uniqueID
+                
+                
         elif (isinstance(request, partRequests.LogicalVolumeRequestSpec) and
               request.preexist == 1):
             # get the preexisting partition they want to use
diff --git a/partitions.py b/partitions.py
index 7cc33e86a..11d034436 100644
--- a/partitions.py
+++ b/partitions.py
@@ -474,18 +474,21 @@ class Partitions:
 	if self.getRaidMemberParent(request) is not None:
 	    return 1
 	else:
-	    return 0 
+	    return 0
 
-    def getLVMLVForVG(self, vgrequest):
-        """Find and return a list of all of the LVs in the VG."""
+    def getLVMLVForVGID(self, vgid):        
+        """Find and return a list of all the LVs associated with a VG id."""
         retval = []
-        vgid = vgrequest.uniqueID
         for request in self.requests:
 	    if request.type == REQUEST_LV:
 		if request.volumeGroup == vgid:
                     retval.append(request)
-
         return retval
+
+    def getLVMLVForVG(self, vgrequest):
+        """Find and return a list of all of the LVs in the VG."""
+        vgid = vgrequest.uniqueID
+        return self.getLVMLVForVGID(vgid)
 		
     def getLVMRequests(self):
         """Return a dictionary of all of the LVM bits.