Обновление вызовов в связи с рефакторингом calculate-lib LVM

master-3.5
parent 51b1432365
commit 9570bea5ef

@ -32,7 +32,7 @@ from calculate.lib.datavars import (TableVariable, Variable, VariableError,
from calculate.lib.utils.device import (getDeviceType, from calculate.lib.utils.device import (getDeviceType,
getPartitionType, getPartitionDevice, getPartitionType, getPartitionDevice,
getRaidPartitions, getRaidPartitions,
getLvmPartitions, getPartitionSize, lvm, getPartitionSize,
humanreadableSize, udev, humanreadableSize, udev,
getUUIDDict, getCommonDeviceName) getUUIDDict, getCommonDeviceName)
from calculate.install.variables.autopartition import Sizes from calculate.install.variables.autopartition import Sizes
@ -532,7 +532,7 @@ class VariableOsDiskType(ReadonlyVariable):
for x in getRaidPartitions(prop.get('DEVPATH', '')): for x in getRaidPartitions(prop.get('DEVPATH', '')):
raidUsedDisks[x] = device raidUsedDisks[x] = device
if diskType.endswith("lvm"): if diskType.endswith("lvm"):
for x in getLvmPartitions(prop.get('DM_VG_NAME', ''), for x in lvm.used_partitions(prop.get('DM_VG_NAME', ''),
prop.get('DM_LV_NAME', '')): prop.get('DM_LV_NAME', '')):
if x in lvmUsedDisks: if x in lvmUsedDisks:
lvmUsedDisks[x].append(device) lvmUsedDisks[x].append(device)

Loading…
Cancel
Save