Skip to content
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

Jump to bottom

Fix encryption debug message in _add_efistub_bootloader() #1991

Merged
merged 2 commits into from
Sep 16, 2023
Merged

Fix encryption debug message in _add_efistub_bootloader() #1991

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
800e10c
Fix encryption debug message in `_add_efistub_bootloader()`
codefiles Aug 6, 2023
6134abd
Merge remote-tracking branch 'upstream/master' into efistub-encrypt-d…
codefiles Sep 16, 2023
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 @@ -1073,10 +1073,10 @@ def _add_efistub_bootloader(
if root_partition in self._disk_encryption.partitions:
# TODO: We need to detect if the encrypted device is a whole disk encryption,
# or simply a partition encryption. Right now we assume it's a partition (and we always have)
debug(f'Identifying root partition by PARTUUID: {root_partition.partuuid}')
debug(f'Root partition is an encrypted device identifying by PARTUUID: {root_partition.partuuid}')
kernel_parameters.append(f'cryptdevice=PARTUUID={root_partition.partuuid}:luksdev root=/dev/mapper/luksdev rw rootfstype={root_partition.safe_fs_type.value} {" ".join(self._kernel_params)}')
else:
debug(f'Root partition is an encrypted device identifying by PARTUUID: {root_partition.partuuid}')
debug(f'Identifying root partition by PARTUUID: {root_partition.partuuid}')
kernel_parameters.append(f'root=PARTUUID={root_partition.partuuid} rw rootfstype={root_partition.safe_fs_type.value} {" ".join(self._kernel_params)}')

parent_dev_path = disk.device_handler.get_parent_device_path(boot_partition.safe_dev_path)
Expand Down