|
|
|
@ -468,7 +468,7 @@ class VariableClTarget(ReadonlyVariable):
|
|
|
|
|
if not systemId or mapDevId.get(disk,'') == systemId:
|
|
|
|
|
systemId = None
|
|
|
|
|
if osInstallScratch:
|
|
|
|
|
return ScratchPartitionDistributive(disk,mdirectory='/mnt/install',
|
|
|
|
|
target = ScratchPartitionDistributive(disk,mdirectory='/mnt/install',
|
|
|
|
|
check=True,fileSystem=fileSystem,
|
|
|
|
|
isFormat=self.isTrue(isFormat),
|
|
|
|
|
systemId=systemId,
|
|
|
|
@ -487,34 +487,34 @@ class VariableClTarget(ReadonlyVariable):
|
|
|
|
|
isFormat=self.isTrue(isFormat),
|
|
|
|
|
systemId=systemId,
|
|
|
|
|
partitionTable=partTable)
|
|
|
|
|
multiPartition = None
|
|
|
|
|
diskData = self.Select(listVars,
|
|
|
|
|
where='os_install_disk_mount',
|
|
|
|
|
ne='/')
|
|
|
|
|
bindData = self.Select(['os_install_bind_path',
|
|
|
|
|
'os_install_bind_mountpoint'],
|
|
|
|
|
where='os_install_bind_mountpoint',
|
|
|
|
|
ne='')
|
|
|
|
|
if diskData or bindData:
|
|
|
|
|
multiPartition = MultiPartitions()
|
|
|
|
|
target.multipartition = multiPartition
|
|
|
|
|
for disk,mount,fileSystem,isFormat,partTable,systemId in diskData:
|
|
|
|
|
if not systemId or mapDevId.get(disk,'') == systemId:
|
|
|
|
|
systemId = None
|
|
|
|
|
multiPartition.addPartition(dev=disk,
|
|
|
|
|
mountPoint=mount,
|
|
|
|
|
fileSystem=fileSystem,
|
|
|
|
|
isFormat=self.isTrue(isFormat),
|
|
|
|
|
systemId=systemId,
|
|
|
|
|
partitionTable=partTable)
|
|
|
|
|
for source,dest in bindData:
|
|
|
|
|
multiPartition.addPartition(dev=source,
|
|
|
|
|
mountPoint=dest,
|
|
|
|
|
fileSystem='bind',
|
|
|
|
|
isFormat=False,
|
|
|
|
|
systemId=None,
|
|
|
|
|
partitionTable='')
|
|
|
|
|
return target
|
|
|
|
|
multiPartition = None
|
|
|
|
|
diskData = self.Select(listVars,
|
|
|
|
|
where='os_install_disk_mount',
|
|
|
|
|
ne='/')
|
|
|
|
|
bindData = self.Select(['os_install_bind_path',
|
|
|
|
|
'os_install_bind_mountpoint'],
|
|
|
|
|
where='os_install_bind_mountpoint',
|
|
|
|
|
ne='')
|
|
|
|
|
if diskData or bindData:
|
|
|
|
|
multiPartition = MultiPartitions()
|
|
|
|
|
target.multipartition = multiPartition
|
|
|
|
|
for disk,mount,fileSystem,isFormat,partTable,systemId in diskData:
|
|
|
|
|
if not systemId or mapDevId.get(disk,'') == systemId:
|
|
|
|
|
systemId = None
|
|
|
|
|
multiPartition.addPartition(dev=disk,
|
|
|
|
|
mountPoint=mount,
|
|
|
|
|
fileSystem=fileSystem,
|
|
|
|
|
isFormat=self.isTrue(isFormat),
|
|
|
|
|
systemId=systemId,
|
|
|
|
|
partitionTable=partTable)
|
|
|
|
|
for source,dest in bindData:
|
|
|
|
|
multiPartition.addPartition(dev=source,
|
|
|
|
|
mountPoint=dest,
|
|
|
|
|
fileSystem='bind',
|
|
|
|
|
isFormat=False,
|
|
|
|
|
systemId=None,
|
|
|
|
|
partitionTable='')
|
|
|
|
|
return target
|
|
|
|
|
|
|
|
|
|
class VariableClImageNewOnly(Variable):
|
|
|
|
|
"""
|
|
|
|
|