Skip to content

Commit b52dc94

Browse files
committed
luks: rework is_unlocked()
1 parent 8c12d15 commit b52dc94

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

archinstall/lib/luks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def _get_luks_uuid(self) -> str:
126126
raise err
127127

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

131131
def unlock(self, key_file: Path | None = None) -> None:
132132
"""
@@ -157,7 +157,7 @@ def unlock(self, key_file: Path | None = None) -> None:
157157

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

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

163163
def lock(self) -> None:

0 commit comments

Comments
 (0)