Skip to content

Fixed issue where secondary encrypted volumes didn't unlock #1281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Torxed merged 1 commit into from
May 29, 2022
Merged

Fixed issue where secondary encrypted volumes didn't unlock #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions archinstall/lib/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ def mount_ordered_layout(self, layouts: Dict[str, Any]) -> None:

# 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:
if partition.get('generate-encryption-key-file',False) and not self._has_root(partition):
list_luks_handles.append([luks_handle,partition,password])
if partition.get('generate-encryption-key-file', False) and not self._has_root(partition):
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
partition['device_instance'] = unlocked_device

Expand Down
5 changes: 5 additions & 0 deletions archinstall/lib/menu/global_menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,11 @@ def exit_callback(self):
partition['encrypted'] = True
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):
missing = len(self._missing_configs())
if missing > 0:
Expand Down