|
|
@ -26,6 +26,7 @@ from calculate.lib.utils.files import (readLinesFile)
|
|
|
|
from calculate.install.fs_manager import FileSystemManager
|
|
|
|
from calculate.install.fs_manager import FileSystemManager
|
|
|
|
from calculate.lib.utils.tools import Sizes, traverse
|
|
|
|
from calculate.lib.utils.tools import Sizes, traverse
|
|
|
|
from itertools import *
|
|
|
|
from itertools import *
|
|
|
|
|
|
|
|
import os
|
|
|
|
|
|
|
|
|
|
|
|
from calculate.lib.cl_lang import setLocalTranslate, _
|
|
|
|
from calculate.lib.cl_lang import setLocalTranslate, _
|
|
|
|
from calculate.lib.variables.system import RootType
|
|
|
|
from calculate.lib.variables.system import RootType
|
|
|
@ -148,11 +149,14 @@ class VariableClAutopartitionDeviceData(ReadonlyTableVariable):
|
|
|
|
for dev, _type, size, name in self.ZipVars(
|
|
|
|
for dev, _type, size, name in self.ZipVars(
|
|
|
|
'os_device_dev', 'os_device_type',
|
|
|
|
'os_device_dev', 'os_device_type',
|
|
|
|
'os_device_size', 'os_device_name'):
|
|
|
|
'os_device_size', 'os_device_name'):
|
|
|
|
|
|
|
|
hsize = humanreadableSize(size)
|
|
|
|
if not _type.startswith('raid'):
|
|
|
|
if not _type.startswith('raid'):
|
|
|
|
_type = "device"
|
|
|
|
_type = "device"
|
|
|
|
|
|
|
|
if not name:
|
|
|
|
|
|
|
|
name = _("Unknown")
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
raidname = _type.upper()
|
|
|
|
raidname = _type.upper()
|
|
|
|
name = "%s (%s)" % (raidname, humanreadableSize(size))
|
|
|
|
name = raidname
|
|
|
|
_type = "raid"
|
|
|
|
_type = "raid"
|
|
|
|
|
|
|
|
|
|
|
|
yield [dev, _type, size, name]
|
|
|
|
yield [dev, _type, size, name]
|
|
|
@ -205,8 +209,13 @@ class VariableClAutopartitionDevice(AutopartitionHelper, Variable):
|
|
|
|
return []
|
|
|
|
return []
|
|
|
|
|
|
|
|
|
|
|
|
def choice(self):
|
|
|
|
def choice(self):
|
|
|
|
return [(dev, name or _("Unknown")) for dev, name in self.ZipVars(
|
|
|
|
getname = lambda dev, name, size: "%s (%s, %s)" % (
|
|
|
|
'cl_autopartition_device_dev', 'cl_autopartition_device_name')]
|
|
|
|
dev, name, humanreadableSize(size)
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
return [(dev, getname(dev, name, size))
|
|
|
|
|
|
|
|
for dev, name, size in self.ZipVars(
|
|
|
|
|
|
|
|
'cl_autopartition_device_dev', 'cl_autopartition_device_name',
|
|
|
|
|
|
|
|
'cl_autopartition_device_size')]
|
|
|
|
|
|
|
|
|
|
|
|
def checkNeeded(self, valuelist, usedDevices, agregationType):
|
|
|
|
def checkNeeded(self, valuelist, usedDevices, agregationType):
|
|
|
|
needDevices = list(set(usedDevices) - set(valuelist))
|
|
|
|
needDevices = list(set(usedDevices) - set(valuelist))
|
|
|
|