gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #201202 from m-bdf/sdboot-infinite-timeout

Browse Source
This commit is contained in:
Franz Pletz
2024-08-06 16:25:25 +02:00
committed by GitHub
parent d08e428206 7ae6219163
commit 481d7272d1
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
View File

@@ -187,8 +187,7 @@ def system_dir(profile: str | None, generation: int, specialisation: str | None)
def write_loader_conf(profile: str | None) -> None: def write_loader_conf(profile: str | None) -> None:
with open(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf.tmp", 'w') as f: with open(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf.tmp", 'w') as f:
if TIMEOUT != "": f.write(f"timeout {TIMEOUT}\n")
f.write(f"timeout {TIMEOUT}\n")
if profile: if profile:
f.write("default nixos-%s-generation-*\n" % profile) f.write("default nixos-%s-generation-*\n" % profile)
else: else:

2
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
View File

@@ -36,7 +36,7 @@ let
nix = config.nix.package.out; nix = config.nix.package.out;
timeout = optionalString (config.boot.loader.timeout != null) config.boot.loader.timeout; timeout = if config.boot.loader.timeout == null then "menu-force" else config.boot.loader.timeout;
configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit;