From 1708f1850d5d620e7a44ab4da4a9c5c028f5008b Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 29 Apr 2021 10:01:43 +0200 Subject: Fixes #350 hopefully. This reverts an old hotfix to make systemd-boot work with dualboot variables. This **NEEDS** to be tested together with a Windows installation dual-boot setup, because this is where variable writing caused issues before. --- archinstall/lib/installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index a5449662..236b69d8 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -377,7 +377,7 @@ class Installer(): # And in which case we should do some clean up. # Install the boot loader - sys_command(f'/usr/bin/arch-chroot {self.target} bootctl --no-variables --path=/boot install') + sys_command(f'/usr/bin/arch-chroot {self.target} bootctl --path=/boot install') # Modify or create a loader.conf if os.path.isfile(f'{self.target}/boot/loader/loader.conf'): -- cgit v1.2.3-54-g00ecf From 4b6a7514c9259def27c7de80d91efd7905366bdb Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 14 May 2021 21:05:18 +0200 Subject: Adding in a default timeout to systemd-boot, but only if no other timeout was specified. Also fixes a regression bug with line endings in the loader configuration. --- archinstall/lib/installer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index ed2d516a..6c87b088 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -397,8 +397,11 @@ class Installer(): for line in loader_data: if line[:8] == 'default ': loader.write(f'default {self.init_time}\n') + elif line[:8] == '#timeout' and 'timeout 5' not in loader_data: + # We add in the default timeout to support dual-boot + loader.write(f"{line[1:]}\n") else: - loader.write(f"{line}") + loader.write(f"{line}\n") ## For some reason, blkid and /dev/disk/by-uuid are not getting along well. ## And blkid is wrong in terms of LUKS. -- cgit v1.2.3-54-g00ecf