Skip to content

luks: rework is_unlocked() #3509

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
May 26, 2025
+2 −2
Merged

luks: rework is_unlocked() #3509

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/luks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def _get_luks_uuid(self) -> str:
raise err

def is_unlocked(self) -> bool:
return self.mapper_name is not None and Path(f'/dev/mapper/{self.mapper_name}').exists()
return (mapper_dev := self.mapper_dev) is not None and mapper_dev.is_symlink()

def unlock(self, key_file: Path | None = None) -> None:
"""
Expand Down Expand Up @@ -157,7 +157,7 @@ def unlock(self, key_file: Path | None = None) -> None:

debug(f'cryptsetup open output: {result.stdout.decode().rstrip()}')

if not self.mapper_dev or not self.mapper_dev.is_symlink():
if not self.is_unlocked():
raise DiskError(f'Failed to open luks2 device: {self.luks_dev_path}')

def lock(self) -> None:
Expand Down