Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-07-08 17:57:04 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-07-08 17:57:04 +0000
commit1fabd5c56608cf496b0b3980d7f5003a57666c76 (patch)
tree5f8ff13a530d4c6fa8aa46a4e6a85d04c7f574fa /archinstall/lib
parenta53483ee8fd60a7fa82dd628eaf03661f2bfac6d (diff)
Swapped crypted and unencrypted logic.
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/installer.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index ffb0567e..444baa5f 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -43,7 +43,6 @@ class Installer():
def minimal_installation(self):
if (x := self.pacstrap('base base-devel linux linux-firmware btrfs-progs efibootmgr nano wpa_supplicant dialog'.split(' '))):
- print(list(os.walk(f'{self.mountpoint}/boot')))
return x
def add_bootloader(self):
@@ -65,25 +64,21 @@ class Installer():
if self.partition.encrypted:
- print(f'Trying to locate {self.partition} under /dev/disk/by-partuuid')
- for root, folders, uids in os.walk('/dev/disk/by-partuuid'):
+ for root, folders, uids in os.walk('/dev/disk/by-uuid'):
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.real_device): continue
- entry.write(f'options cryptdevice=PARTUUID={uid}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n')
- print(list(os.walk(f'{self.mountpoint}/boot')))
+ entry.write(f'options cryptdevice=UUID={uid}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n')
return True
break
else:
- print(f'Trying to locate {os.path.basename(self.partition.path)} under /dev/disk/by-uuid')
- for root, folders, uids in os.walk('/dev/disk/by-uuid'):
+ 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
entry.write(f'options root=PARTUUID={uid} rw intel_pstate=no_hwp\n')
- print(list(os.walk(f'{self.mountpoint}/boot')))
return True
break
raise RequirementError(f'Could not identify the UUID of {self.partition}, there for {self.mountpoint}/boot/loader/entries/arch.conf will be broken until fixed.')