Unverified Commit 481d7272 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

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

parents d08e4282 7ae62191

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py

+1 −2
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ def system_dir(profile: str | None, generation: int, specialisation: str | None) 


def write_loader_conf(profile: str | None) -> None:

    with open(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf.tmp", 'w') as f:

        if TIMEOUT != "":

        f.write(f"timeout {TIMEOUT}\n")

        if profile:

            f.write("default nixos-%s-generation-*\n" % profile)

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ let 


    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;