From 9fe4dbc50e3a85e16af655b3f6071e35db837ae4 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 11 Nov 2021 09:39:56 +0000 Subject: Modified last few places where password gets set. --- archinstall/lib/installer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'archinstall/lib/installer.py') 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}") -- cgit v1.2.3-70-g09d2