From 1fabd5c56608cf496b0b3980d7f5003a57666c76 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 8 Jul 2020 17:57:04 +0000 Subject: Swapped crypted and unencrypted logic. --- archinstall/lib/installer.py | 11 +++-------- setup.py | 2 +- 2 files changed, 4 insertions(+), 9 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.') diff --git a/setup.py b/setup.py index 16f30635..990b16cf 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open("README.md", "r") as fh: setuptools.setup( name="archinstall", - version="2.0.3rc16", + version="2.0.3rc17", author="Anton Hvornum", author_email="anton@hvornum.se", description="Arch Linux installer - guided, templates etc.", -- cgit v1.2.3-70-g09d2