RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Swapped crypted and unencrypted logic.

This commit is contained in:
Anton Hvornum 2020-07-08 17:57:04 +00:00
parent a53483ee8f
commit 1fabd5c566
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archinstall/lib/installer.py
View File

@ -43,7 +43,6 @@ class Installer():
def minimal_installation(self): def minimal_installation(self):
if (x := self.pacstrap('base base-devel linux linux-firmware btrfs-progs efibootmgr nano wpa_supplicant dialog'.split(' '))): 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 return x
def add_bootloader(self): def add_bootloader(self):
@ -65,25 +64,21 @@ class Installer():
if self.partition.encrypted: 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-uuid'):
for root, folders, uids in os.walk('/dev/disk/by-partuuid'):
for uid in uids: for uid in uids:
real_path = os.path.realpath(os.path.join(root, uid)) 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 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') entry.write(f'options cryptdevice=UUID={uid}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n')
print(list(os.walk(f'{self.mountpoint}/boot')))
return True return True
break break
else: 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-partuuid'):
for root, folders, uids in os.walk('/dev/disk/by-uuid'):
for uid in uids: for uid in uids:
real_path = os.path.realpath(os.path.join(root, uid)) 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.path): continue
entry.write(f'options root=PARTUUID={uid} rw intel_pstate=no_hwp\n') entry.write(f'options root=PARTUUID={uid} rw intel_pstate=no_hwp\n')
print(list(os.walk(f'{self.mountpoint}/boot')))
return True return True
break 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.') 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.')

2
setup.py
View File

@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
setuptools.setup( setuptools.setup(
name="archinstall", name="archinstall",
version="2.0.3rc16", version="2.0.3rc17",
author="Anton Hvornum", author="Anton Hvornum",
author_email="anton@hvornum.se", author_email="anton@hvornum.se",
description="Arch Linux installer - guided, templates etc.", description="Arch Linux installer - guided, templates etc.",