Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/installer.py
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-07-08 16:12:57 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-07-08 16:12:57 +0000
commitc271e4c0d7f15c13fe056d80f1b652b6eebde21a (patch)
tree3c9dee70d4a7882fc51f01060ae06191822530d2 /archinstall/lib/installer.py
parent078567f81c17492d0f3bc857a6efa09cc3503fa5 (diff)
Added a encrypted flag to the Partition() object. So that certain checks can be done by the Installer() later on, for instance when adding a bootloader. There's also a now which tries to find the parent device to the unlocked encrypted device.
Diffstat (limited to 'archinstall/lib/installer.py')
-rw-r--r--archinstall/lib/installer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 07b31a14..0a1fb784 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -63,11 +63,11 @@ class Installer():
if self.partition.encrypted:
- print(f'Trying to locate {os.path.basename(self.partition.path)} under /dev/disk/by-partuuid')
+ print(f'Trying to locate {self.partition} under /dev/disk/by-partuuid')
for root, folders, uids in os.walk('/dev/disk/by-partuuid'):
for uid in uids:
real_path = os.path.realpath(os.path.join(root, uid))
- if not os.path.basename(real_path) == os.path.basename(self.partition.path): continue
+ if not os.path.basename(real_path) == os.path.basename(self.partition.real_device): continue
entry.write(f'options cryptdevice=PARTUUID={uid}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n')
return True