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@hvornum.se>2021-05-14 21:05:18 +0200
committerAnton Hvornum <anton@hvornum.se>2021-05-14 21:05:18 +0200
commit4b6a7514c9259def27c7de80d91efd7905366bdb (patch)
tree3fba99fd3c1da1269cf9c11ce0fa015f29f33aec /archinstall
parent3edb33c4398ac8ff0236f1b33341eafa9adafbad (diff)
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.
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/installer.py5
1 files changed, 4 insertions, 1 deletions
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.