Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-04-09 22:34:26 +0200
committerAnton Hvornum <anton@hvornum.se>2021-04-09 22:34:26 +0200
commit8f096001b6f5c8a864bc1e65b56bbfad1a9c9a3f (patch)
tree38dcb0626a44489388c41c4772a2b5a99dd6c354 /archinstall
parent0370c44ed812961460de48d6e8888f8e868cc7fa (diff)
Attempting to correct some inconsitencies in disk-parent reporting.
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/disk.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index fe06ac00..1f0e584a 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -220,12 +220,9 @@ class Partition():
@property
def real_device(self):
- if not self._encrypted:
- return self.path
- else:
- for blockdevice in json.loads(b''.join(sys_command('lsblk -J')).decode('UTF-8'))['blockdevices']:
- if (parent := self.find_parent_of(blockdevice, os.path.basename(self.path))):
- return f"/dev/{parent}"
+ for blockdevice in json.loads(b''.join(sys_command('lsblk -J')).decode('UTF-8'))['blockdevices']:
+ if (parent := self.find_parent_of(blockdevice, os.path.basename(self.path))):
+ return f"/dev/{parent}"
# raise DiskError(f'Could not find appropriate parent for encrypted partition {self}')
return self.path