RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified last few places where password gets set.

This commit is contained in:
Anton Hvornum 2021-11-11 09:39:56 +00:00
parent df59809206
commit 9fe4dbc50e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/installer.py
View File

@ -176,7 +176,9 @@ class Installer:
for mountpoint in sorted(mountpoints.keys()): for mountpoint in sorted(mountpoints.keys()):
if mountpoints[mountpoint]['encrypted']: if mountpoints[mountpoint]['encrypted']:
loopdev = storage.get('ENC_IDENTIFIER', 'ai') + 'loop' 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: with luks2(mountpoints[mountpoint]['device_instance'], loopdev, password, auto_unmount=False) as unlocked_device:
unlocked_device.mount(f"{self.target}{mountpoint}") unlocked_device.mount(f"{self.target}{mountpoint}")

2
archinstall/lib/user_interaction.py
View File

@ -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: def select_encrypted_partitions(block_devices :dict, password :str) -> dict:
root = find_partition_by_mountpoint(block_devices, '/') root = find_partition_by_mountpoint(block_devices, '/')
root['encrypted'] = True root['encrypted'] = True
root['password'] = password root['!password'] = password
return block_devices return block_devices