| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/installer.py | 4 | ||||
| -rw-r--r-- | archinstall/lib/user_interaction.py | 2 |
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 1318cb16..3b8f9612 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -176,7 +176,9 @@ class Installer: for mountpoint in sorted(mountpoints.keys()): if mountpoints[mountpoint]['encrypted']: loopdev = storage.get('ENC_IDENTIFIER', 'ai') + 'loop' - password = mountpoints[mountpoint]['password'] + if not (password := mountpoints[mountpoint].get('!password', None)): + raise RequirementError(f"Missing mountpoint {mountpoint} encryption password in layout: {mountpoints[mountpoint]}") + with luks2(mountpoints[mountpoint]['device_instance'], loopdev, password, auto_unmount=False) as unlocked_device: unlocked_device.mount(f"{self.target}{mountpoint}") diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index e62d8c6c..c8b3fd91 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -195,7 +195,7 @@ def generic_multi_select(options, text="Select one or more of the options above def select_encrypted_partitions(block_devices :dict, password :str) -> dict: root = find_partition_by_mountpoint(block_devices, '/') root['encrypted'] = True - root['password'] = password + root['!password'] = password return block_devices |