From cf60ba88003303fcba959924b7e4e3b90e1572c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 11 Oct 2017 13:49:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=B0=D0=BB=D0=B3=D0=BE=D1=80=D0=B8=D1=82=D0=BC=20?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20EFI=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D1=82=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * для LVM EFI берутся раздел(ы) с первого устройства, на котором они есть * для RAID0 только первый диск * для всех остальных RAID все диски --- pym/install/variables/autopartition.py | 59 +++++++++++++++++--------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/pym/install/variables/autopartition.py b/pym/install/variables/autopartition.py index 805f46c..f591487 100644 --- a/pym/install/variables/autopartition.py +++ b/pym/install/variables/autopartition.py @@ -144,20 +144,24 @@ class VariableClAutopartitionDeviceData(ReadonlyTableVariable): 'cl_autopartition_device_size', 'cl_autopartition_device_name'] + re_raid = re.compile("raid[1-9]") + def get(self, hr=HumanReadable.No): def generator(): - for dev, _type, size, name in self.ZipVars( + for dev, _type, fulltype, size, name in self.ZipVars( 'os_device_dev', 'os_device_type', + 'os_device_fulltype', 'os_device_size', 'os_device_name'): - hsize = humanreadableSize(size) if not _type.startswith('raid'): _type = "device" if not name: name = _("Unknown") else: - raidname = _type.upper() - name = raidname - _type = "raid" + name = _type.upper() + if self.re_raid.search(fulltype): + _type = "raid" + else: + _type = "raid0" yield [dev, _type, size, name] @@ -353,15 +357,15 @@ class VariableClAutopartitionSchemeBuilder(ReadonlyVariable): int(self.Get('cl_autopartition_calculate_size')) used_devices = self.Get('cl_autopartition_device') - type_map = { - "raid": partition.VolumesBuilder.DeviceType.RAID, - "device": partition.VolumesBuilder.DeviceType.Device, - } for dev, _type, size in self.ZipVars("cl_autopartition_device_dev", "cl_autopartition_device_type", "cl_autopartition_device_size"): if dev in used_devices: - sb.add_device(dev, type_map.get(_type), int(size)) + if _type.startswith("raid"): + device_type = partition.VolumesBuilder.DeviceType.RAID + else: + device_type = partition.VolumesBuilder.DeviceType.Device + sb.add_device(dev, device_type, int(size)) sb.default_format = self.Get('cl_autopartition_default_format') @@ -763,7 +767,7 @@ class VariableClAutopartitionRaid(ReadonlyVariable): return [ dev for dev, _type in self.ZipVars( "cl_autopartition_device_dev", "cl_autopartition_device_type") - if dev in selected_dev and _type == "raid"] + if dev in selected_dev and _type.startswith("raid")] class VariableClAutopartitionRaidParent(ReadonlyVariable): """ @@ -808,14 +812,31 @@ class VariableClAutopartitionEfi(ReadonlyVariable): if not self.GetBool('cl_autopartition_uefi_set'): return [] - selected_raid_devices = self.Get('cl_autopartition_raid_parent') - - efi = (efi for efi in self.select( - 'os_device_efi', os_device_dev__in=selected_raid_devices) - if efi) - var_factory = self.Get('cl_autopartition_factory') - return sorted(set(efi) | set(var_factory.efi)) + selected_dev = self.Get('cl_autopartition_device') + selected_data = ((dev, _type) for dev, _type in self.ZipVars( + "cl_autopartition_device_dev", "cl_autopartition_device_type") + if dev in selected_dev) + for dev, _type in selected_data: + if _type == "device": + if var_factory.efi: + return var_factory.efi[:1] + elif _type == "raid0": + parents = self.select('os_device_parent', + os_device_dev=dev, limit=1).split(',') + efidev = self.select('os_device_efi', os_device_dev__in=parents, + limit=1) + if efidev: + return [efidev] + # прочие raid + else: + parents = self.select('os_device_parent', + os_device_dev=dev, limit=1).split(',') + efidevs = self.select('os_device_efi', + os_device_dev__in=parents) + if efidevs: + return sorted(set(filter(None, efidevs))) + return [] class VariableClAutopartitionParent(ReadonlyVariable): @@ -830,7 +851,7 @@ class VariableClAutopartitionParent(ReadonlyVariable): for dev, _type in self.ZipVars( "cl_autopartition_device_dev", "cl_autopartition_device_type"): - if dev in selected_dev and _type != "raid": + if dev in selected_dev and not _type.startswith("raid"): yield dev return ",".join(sorted(set(generate())))