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

Made sure generate-encryption-key-file is set for supplementary partitions to / (#1281)

This commit is contained in:
Anton Hvornum 2022-05-29 13:59:25 +02:00 committed by GitHub
parent 7dbea73514
commit c75e6a1da3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 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

@ -253,8 +253,8 @@ class Installer:
# note that we DON'T auto_unmount (i.e. close the encrypted device so it can be used # note that we DON'T auto_unmount (i.e. close the encrypted device so it can be used
with (luks_handle := luks2(partition['device_instance'], loopdev, password, auto_unmount=False)) as unlocked_device: with (luks_handle := luks2(partition['device_instance'], loopdev, password, auto_unmount=False)) as unlocked_device:
if partition.get('generate-encryption-key-file',False) and not self._has_root(partition): if partition.get('generate-encryption-key-file', False) and not self._has_root(partition):
list_luks_handles.append([luks_handle,partition,password]) list_luks_handles.append([luks_handle, partition, password])
# this way all the requesrs will be to the dm_crypt device and not to the physical partition # this way all the requesrs will be to the dm_crypt device and not to the physical partition
partition['device_instance'] = unlocked_device partition['device_instance'] = unlocked_device

5
archinstall/lib/menu/global_menu.py
View File

@ -215,6 +215,11 @@ class GlobalMenu(GeneralMenu):
partition['encrypted'] = True partition['encrypted'] = True
partition['!password'] = storage['arguments']['!encryption-password'] partition['!password'] = storage['arguments']['!encryption-password']
# We make sure generate-encryption-key-file is set on additional partitions
# other than the root partition. Otherwise they won't unlock properly #1279
if partition['mountpoint'] != '/':
partition['generate-encryption-key-file'] = True
def _install_text(self): def _install_text(self):
missing = len(self._missing_configs()) missing = len(self._missing_configs())
if missing > 0: if missing > 0: