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.feeds+github@gmail.com>2020-07-08 14:31:01 +0000
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-07-08 14:31:01 +0000
commitef5cbac118ef65abbd5d74ed2257cea88d9ef580 (patch)
tree503fefa8fcb674b559625f5dc40f3413f5a6bfb5 /archinstall
parent614d6374b86120eb3a34fc8316235feb3eeb9d81 (diff)
Fixed an issue where the boot loader tried to point the / boot towards the /boot partition in the loader entry.
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/installer.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index d3e6c381..dda69495 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -41,10 +41,10 @@ class Installer():
def minimal_installation(self):
return self.pacstrap('base base-devel linux linux-firmware btrfs-progs efibootmgr nano wpa_supplicant dialog'.split(' '))
- def add_bootloader(self, partition):
- log(f'Adding bootloader to {partition}')
+ def add_bootloader(self, boot_partition):
+ log(f'Adding bootloader to {boot_partition}')
os.makedirs(f'{self.mountpoint}/boot', exist_ok=True)
- partition.mount(f'{self.mountpoint}/boot')
+ boot_partition.mount(f'{self.mountpoint}/boot')
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.mountpoint} bootctl --no-variables --path=/boot install'))
with open(f'{self.mountpoint}/boot/loader/loader.conf', 'w') as loader:
@@ -65,7 +65,7 @@ class Installer():
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(partition.path): continue
+ if not os.path.basename(real_path) == os.path.basename(self.partition.path): continue
entry.write(f'options cryptdevice=UUID={uid}:luksdev root=/dev/mapper/luksdev rw intel_pstate=no_hwp\n')
return True