From a3d5f4f3efe51a13cece90d51284f85033fcbc28 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Wed, 28 Jan 2015 15:58:23 +0100 Subject: nixos: gummiboot: change default to 1000 if boot.loader.timeout is null When gummiboot.timeout == null, the menu will still be skipped. When gummiboot.timeout == 0, the menu will also be skipped. The only way to show the menu 'indefinitely' is to show it a long time. --- nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix index b1ecbb8141fc..6c201eb8212f 100644 --- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix +++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix @@ -31,9 +31,7 @@ in { }; timeout = mkOption { - default = if (config.boot.loader.timeout != null) then - (if (config.boot.loader.timeout == 0) then null else config.boot.loader.timeout) - else config.boot.loader.timeout; + default = if config.boot.loader.timeout == null then 10000 else config.boot.loader.timeout; example = 4; -- cgit 1.4.1