fix for bug 29544 - we were not handling kickstart raid specifications which used --onpart correctly

1 files changed, 10 insertions, 1 deletions

diff --git a/installclass.py b/installclass.py
index 04f0c59d5..78ed94a47 100644
--- a/installclass.py
+++ b/installclass.py
@@ -56,12 +56,20 @@ class BaseInstallClass:
     def addRaidEntry(self, mntPoint, raidDev, level, devices):
 	# throw an exception for bad raid levels
 	[ 0, 1, 5 ].index(level)
+
 	for device in devices:
 	    found = 0
 
             for (otherMountPoint, sizespc, (devX, partX, primOnlyX), typespecX, fsoptsX) in self.partitions:
 		if otherMountPoint == device:
 		    found = 1
+
+            # check prexisting partions specified in ks.cfg with --usepart
+            if not found:
+                for (otherMountPoint, (devX, fstypeX, reformatX)) in self.fstab:
+                    if otherMountPoint == device:
+                        found = 1
+                
 	    if not found:
 		raise ValueError, "unknown raid device %s" % (device,)
 	if mntPoint[0] != '/' and mntPoint != 'swap':
@@ -73,7 +81,8 @@ class BaseInstallClass:
 	if len(devices) < 2:
 	    raise ValueError, "raid arrays require at least 2 devices"
 
-	self.raidList.append(mntPoint, raidDev, level, devices)	
+	self.raidList.append(mntPoint, raidDev, level, devices)
+
 
     def addNewPartition(self, mntPoint, sizespec, locspec, typespec, fsopts=None):
         (device, part, primOnly) = locspec