summary refs log tree commit diff
diff options
context:
space:
mode:
authorBob van der Linden <bobvanderlinden@gmail.com>2015-01-28 15:58:23 +0100
committerLuca Bruno <lethalman88@gmail.com>2015-01-30 10:36:21 +0100
commita3d5f4f3efe51a13cece90d51284f85033fcbc28 (patch)
tree75055de287187080037a7e9527c8ed9827598bea
parentf93ba5146954a98a3ba132ebd1cd81f04ba01fe4 (diff)
downloadnixlib-a3d5f4f3efe51a13cece90d51284f85033fcbc28.tar
nixlib-a3d5f4f3efe51a13cece90d51284f85033fcbc28.tar.gz
nixlib-a3d5f4f3efe51a13cece90d51284f85033fcbc28.tar.bz2
nixlib-a3d5f4f3efe51a13cece90d51284f85033fcbc28.tar.lz
nixlib-a3d5f4f3efe51a13cece90d51284f85033fcbc28.tar.xz
nixlib-a3d5f4f3efe51a13cece90d51284f85033fcbc28.tar.zst
nixlib-a3d5f4f3efe51a13cece90d51284f85033fcbc28.zip
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.
-rw-r--r--nixos/modules/system/boot/loader/gummiboot/gummiboot.nix4
1 files changed, 1 insertions, 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;