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

Fix boot loader disk encryption conditional (#1950)

This commit is contained in:
codefiles 2023-07-26 09:22:01 -04:00 committed by GitHub
parent 1af21c3e95
commit 7326d51161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/lib/installer.py
View File

@ -797,7 +797,7 @@ class Installer:
options_entry = [] options_entry = []
if root_partition.safe_fs_type.is_crypto(): if root_partition in self._disk_encryption.partitions:
# TODO: We need to detect if the encrypted device is a whole disk encryption, # 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) # or simply a partition encryption. Right now we assume it's a partition (and we always have)
debug('Root partition is an encrypted device, identifying by PARTUUID: {root_partition.partuuid}') debug('Root partition is an encrypted device, identifying by PARTUUID: {root_partition.partuuid}')
@ -858,7 +858,7 @@ class Installer:
_file = "/etc/default/grub" _file = "/etc/default/grub"
if root_partition.safe_fs_type.is_crypto(): if root_partition in self._disk_encryption.partitions:
debug(f"Using UUID {root_partition.uuid} as encrypted root identifier") debug(f"Using UUID {root_partition.uuid} as encrypted root identifier")
cmd_line_linux = f"sed -i 's/GRUB_CMDLINE_LINUX=\"\"/GRUB_CMDLINE_LINUX=\"cryptdevice=UUID={root_partition.uuid}:cryptlvm rootfstype={root_partition.safe_fs_type.value}\"/'" cmd_line_linux = f"sed -i 's/GRUB_CMDLINE_LINUX=\"\"/GRUB_CMDLINE_LINUX=\"cryptdevice=UUID={root_partition.uuid}:cryptlvm rootfstype={root_partition.safe_fs_type.value}\"/'"
@ -1049,7 +1049,7 @@ TIMEOUT=5
# blkid doesn't trigger on loopback devices really well, # blkid doesn't trigger on loopback devices really well,
# so we'll use the old manual method until we get that sorted out. # so we'll use the old manual method until we get that sorted out.
if root_partition.safe_fs_type.is_crypto(): if root_partition in self._disk_encryption.partitions:
# TODO: We need to detect if the encrypted device is a whole disk encryption, # 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) # 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'Identifying root partition by PARTUUID: {root_partition.partuuid}')