From f93ba5146954a98a3ba132ebd1cd81f04ba01fe4 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Wed, 14 Jan 2015 20:35:54 +0100
Subject: nixos: loader: added generic config.boot.loader.timeout option

timeout options of grub and gummiboot will inherit the value of this
option by default.
---
 nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nixos/modules/system/boot/loader/gummiboot/gummiboot.nix')

diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
index 003f72b37f9e..b1ecbb8141fc 100644
--- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
+++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
@@ -31,7 +31,9 @@ in {
     };
 
     timeout = mkOption {
-      default = null;
+      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;
 
       example = 4;
 
-- 
cgit 1.4.1