|
|
|
@ -341,17 +341,20 @@ class fillVars(object, glob_attr):
|
|
|
|
|
dev_hash['grub'] = ""
|
|
|
|
|
disk_hash[devName] = dev_hash
|
|
|
|
|
if "raid" in dev_hash['type']:
|
|
|
|
|
raidUsedDisks.extend(getRaidPartitions(disk))
|
|
|
|
|
raidUsedDisks.extend(map(lambda x:(devName,x),getRaidPartitions(disk)))
|
|
|
|
|
if dev_hash['type'].endswith("lvm"):
|
|
|
|
|
prop = getUdevDeviceInfo(path=disk)
|
|
|
|
|
lvmUsedDisks.extend(getLvmPartitions(prop.get('DM_VG_NAME',''),
|
|
|
|
|
prop.get('DM_LV_NAME','')))
|
|
|
|
|
for part in raidUsedDisks:
|
|
|
|
|
lvmUsedDisks.extend(map(lambda x:(devName,x),
|
|
|
|
|
getLvmPartitions(prop.get('DM_VG_NAME',''),
|
|
|
|
|
prop.get('DM_LV_NAME',''))))
|
|
|
|
|
for disk,part in raidUsedDisks:
|
|
|
|
|
if part in disk_hash:
|
|
|
|
|
disk_hash[part]['type'] = "%s-raidmember"%disk_hash[part]['type']
|
|
|
|
|
for part in lvmUsedDisks:
|
|
|
|
|
disk_hash[part]['type'] = "%s-raidmember(%s)"%(
|
|
|
|
|
disk_hash[part]['type'],disk)
|
|
|
|
|
for disk,part in lvmUsedDisks:
|
|
|
|
|
if part in disk_hash:
|
|
|
|
|
disk_hash[part]['type'] = "%s-lvmmember"%disk_hash[part]['type']
|
|
|
|
|
disk_hash[part]['type'] = "%s-lvmmember(%s)"%(
|
|
|
|
|
disk_hash[part]['type'],disk)
|
|
|
|
|
return disk_hash
|
|
|
|
|
|
|
|
|
|
def separateDevice(self,device):
|
|
|
|
|