| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/disk/device_model.py | 7 | ||||
| -rw-r--r-- | archinstall/lib/disk/encryption_menu.py | 2 | ||||
| -rw-r--r-- | archinstall/scripts/minimal.py | 2 | ||||
| -rw-r--r-- | examples/full_automated_installation.py | 2 | ||||
| -rw-r--r-- | examples/minimal_installation.py | 2 |
diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py index 8e72390c..35fbd40c 100644 --- a/archinstall/lib/disk/device_model.py +++ b/archinstall/lib/disk/device_model.py @@ -777,13 +777,12 @@ class DeviceModification: class EncryptionType(Enum): NoEncryption = "no_encryption" - Partition = "partition" + Luks = "luks" @classmethod def _encryption_type_mapper(cls) -> Dict[str, 'EncryptionType']: return { - # str(_('Full disk encryption')): EncryptionType.FullDiskEncryption, - str(_('Partition encryption')): EncryptionType.Partition + 'Luks': EncryptionType.Luks } @classmethod @@ -800,7 +799,7 @@ class EncryptionType(Enum): @dataclass class DiskEncryption: - encryption_type: EncryptionType = EncryptionType.Partition + encryption_type: EncryptionType = EncryptionType.Luks encryption_password: str = '' partitions: List[PartitionModification] = field(default_factory=list) hsm_device: Optional[Fido2Device] = None diff --git a/archinstall/lib/disk/encryption_menu.py b/archinstall/lib/disk/encryption_menu.py index 8c64e65e..89eade2b 100644 --- a/archinstall/lib/disk/encryption_menu.py +++ b/archinstall/lib/disk/encryption_menu.py @@ -110,7 +110,7 @@ class DiskEncryptionMenu(AbstractSubMenu): def select_encryption_type(preset: EncryptionType) -> Optional[EncryptionType]: title = str(_('Select disk encryption option')) options = [ - EncryptionType.type_to_text(EncryptionType.Partition) + EncryptionType.type_to_text(EncryptionType.Luks) ] preset_value = EncryptionType.type_to_text(preset) diff --git a/archinstall/scripts/minimal.py b/archinstall/scripts/minimal.py index 704759fc..f6650ff8 100644 --- a/archinstall/scripts/minimal.py +++ b/archinstall/scripts/minimal.py @@ -82,7 +82,7 @@ def parse_disk_encryption(): partitions += list(filter(lambda x: x.mountpoint != Path('/boot'), mod.partitions)) archinstall.arguments['disk_encryption'] = disk.DiskEncryption( - encryption_type=disk.EncryptionType.Partition, + encryption_type=disk.EncryptionType.Luks, encryption_password=enc_password, partitions=partitions ) diff --git a/examples/full_automated_installation.py b/examples/full_automated_installation.py index dcef731a..79e85348 100644 --- a/examples/full_automated_installation.py +++ b/examples/full_automated_installation.py @@ -63,7 +63,7 @@ disk_config = disk.DiskLayoutConfiguration( # disk encryption configuration (Optional) disk_encryption = disk.DiskEncryption( encryption_password="enc_password", - encryption_type=disk.EncryptionType.Partition, + encryption_type=disk.EncryptionType.Luks, partitions=[home_partition], hsm_device=None ) diff --git a/examples/minimal_installation.py b/examples/minimal_installation.py index e31adea4..c91a5d46 100644 --- a/examples/minimal_installation.py +++ b/examples/minimal_installation.py @@ -66,7 +66,7 @@ def parse_disk_encryption(): partitions += list(filter(lambda x: x.mountpoint != Path('/boot'), mod.partitions)) archinstall.arguments['disk_encryption'] = disk.DiskEncryption( - encryption_type=disk.EncryptionType.Partition, + encryption_type=disk.EncryptionType.Luks, encryption_password=enc_password, partitions=partitions ) |