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@hvornum.se>2021-05-14 19:07:09 +0000
committerGitHub <noreply@github.com>2021-05-14 19:07:09 +0000
commit71b14ec9fd6e4166fd43c5d1c19b283b5c9efea6 (patch)
tree3fba99fd3c1da1269cf9c11ce0fa015f29f33aec /archinstall/lib
parentdc48bad941a25ded5a9a84144a80cf54195c0ce9 (diff)
parent4b6a7514c9259def27c7de80d91efd7905366bdb (diff)
Merge pull request #381 from archlinux/torxed-fix-350
Fixes #350. This reverts an old hot-fix to make systemd-boot not wipe out windows boot loader.
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/installer.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 2b5f43b1..6c87b088 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -381,7 +381,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'):
@@ -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.