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

Bumped up default timout, as 5 seconds is not enough for some platforms.

This commit is contained in:
Anton Hvornum 2022-04-25 10:20:00 +02:00
parent 44727e64ea
commit 1bce561a0c
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/installer.py
View File

@ -740,14 +740,14 @@ class Installer:
else: else:
loader_data = [ loader_data = [
f"default {self.init_time}", f"default {self.init_time}",
"timeout 5" "timeout 15"
] ]
with open(f'{self.target}/boot/loader/loader.conf', 'w') as loader: with open(f'{self.target}/boot/loader/loader.conf', 'w') as loader:
for line in loader_data: for line in loader_data:
if line[:8] == 'default ': if line[:8] == 'default ':
loader.write(f'default {self.init_time}_{self.kernels[0]}\n') loader.write(f'default {self.init_time}_{self.kernels[0]}\n')
elif line[:8] == '#timeout' and 'timeout 5' not in loader_data: elif line[:8] == '#timeout' and 'timeout 15' not in loader_data:
# We add in the default timeout to support dual-boot # We add in the default timeout to support dual-boot
loader.write(f"{line[1:]}\n") loader.write(f"{line[1:]}\n")
else: else:

2
archinstall/lib/menu/selection_menu.py
View File

@ -181,7 +181,7 @@ class GeneralMenu:
;type preview_size: float (range 0..1) ;type preview_size: float (range 0..1)
""" """
self._enabled_order = [] self._enabled_order :List[str] = []
self._translation = Translation.load_nationalization() self._translation = Translation.load_nationalization()
self.is_context_mgr = False self.is_context_mgr = False
self._data_store = data_store if data_store is not None else {} self._data_store = data_store if data_store is not None else {}