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-03-14 15:11:05 +0100
committerAnton Hvornum <anton@hvornum.se>2021-03-14 15:11:05 +0100
commitdabaebe2216fbc53a00c9c3580b5ca0aa2e515e1 (patch)
tree840fdbb6e72b042083670a71d2178588c8f44121 /archinstall
parentb90820c1c0e4848b683bbee8e3ffe489b4031935 (diff)
encrypted devices won't always report as a child to a device, can't reliably look for a 'parent' of a encrypted drive when it doesn't show up. Hence, the DiskError() can't be raised just because we can't find a parent. The parent should be the current path if no other option was found.
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/disk.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index b8a77ef8..0e76cb0e 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -187,7 +187,8 @@ class Partition():
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}')
+ # raise DiskError(f'Could not find appropriate parent for encrypted partition {self}')
+ return self.path
def detect_inner_filesystem(self, password):
log(f'Trying to detect inner filesystem format on {self} (This might take a while)', level=LOG_LEVELS.Info)