Skip to content

Don't write encryption keyfiles to an unencrypted root partition #4349

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
svartkanin merged 1 commit into from
Apr 1, 2026
+28 −4
Merged

Don't write encryption keyfiles to an unencrypted root partition #4349

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
12 changes: 12 additions & 0 deletions archinstall/lib/disk/luks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,18 @@ def create_keyfile(self, target_path: Path, override: bool = False) -> None:
self._add_key(key_file)
self._crypttab(crypttab_path, kf_path, options=['luks', 'key-slot=1'])

def create_crypttab_entry(self, target_path: Path) -> None:
"""
Add a crypttab entry without a keyfile so systemd prompts
for the passphrase at boot.
"""
if self.mapper_name is None:
raise ValueError('Mapper name must be provided')

crypttab_path = target_path / 'etc/crypttab'
crypttab_path.parent.mkdir(parents=True, exist_ok=True)
self._crypttab(crypttab_path, Path('none'), options=['luks'])

def _add_key(self, key_file: Path) -> None:
debug(f'Adding additional key-file {key_file}')

Expand Down
20 changes: 16 additions & 4 deletions archinstall/lib/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,8 @@ def generate_key_files(self) -> None:
pass

def _generate_key_files_partitions(self) -> None:
root_is_encrypted = any(p.is_root() for p in self._disk_encryption.partitions)

for part_mod in self._disk_encryption.partitions:
gen_enc_file = self._disk_encryption.should_generate_encryption_file(part_mod)

Expand All @@ -454,8 +456,12 @@ def _generate_key_files_partitions(self) -> None:
)

if gen_enc_file and not part_mod.is_root():
debug(f'Creating key-file: {part_mod.dev_path}')
luks_handler.create_keyfile(self.target)
if root_is_encrypted:
debug(f'Creating key-file: {part_mod.dev_path}')
luks_handler.create_keyfile(self.target)
else:
debug(f'Adding passphrase-based crypttab entry for {part_mod.dev_path}')
luks_handler.create_crypttab_entry(self.target)

if part_mod.is_root() and not gen_enc_file:
if self._disk_encryption.hsm_device:
Expand All @@ -467,6 +473,8 @@ def _generate_key_files_partitions(self) -> None:
)

def _generate_key_file_lvm_volumes(self) -> None:
root_is_encrypted = any(v.is_root() for v in self._disk_encryption.lvm_volumes)

for vol in self._disk_encryption.lvm_volumes:
gen_enc_file = self._disk_encryption.should_generate_encryption_file(vol)

Expand All @@ -477,8 +485,12 @@ def _generate_key_file_lvm_volumes(self) -> None:
)

if gen_enc_file and not vol.is_root():
info(f'Creating key-file: {vol.dev_path}')
luks_handler.create_keyfile(self.target)
if root_is_encrypted:
info(f'Creating key-file: {vol.dev_path}')
luks_handler.create_keyfile(self.target)
else:
info(f'Adding passphrase-based crypttab entry for {vol.dev_path}')
luks_handler.create_crypttab_entry(self.target)

if vol.is_root() and not gen_enc_file:
if self._disk_encryption.hsm_device:
Expand Down
Loading