From 626a666da53229e463549bca0d24e2b21a4801cd Mon Sep 17 00:00:00 2001 From: Josh Cartwright Date: Wed, 3 Sep 2014 05:36:45 +0200 Subject: [PATCH] gummiboot/builder: fix timeout setting when unset The gummiboot-builder.py script is expecting the @timeout@ metavar to be substituted for either an empty string (in the case where a user has left the timeout unset) or the actual value set in the system configuration. However, the config.boot.loader.gummiboot.timeout option defaults to 'null', and due to the way pkgs.substituteAll works, the substitution for '@timeout@' is _never_ set to the empty string. This causes the builder script to put a bogus line into /boot/loader/loader.conf: timeout @timeout@ Fix this by explicitly setting 'timeout' to the empty string when it's unset in the system configuration. Signed-off-by: Josh Cartwright --- nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix index e7a481e90a79..003f72b37f9e 100644 --- a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix +++ b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix @@ -16,7 +16,7 @@ let nix = config.nix.package; - inherit (cfg) timeout; + timeout = if cfg.timeout != null then cfg.timeout else ""; inherit (efi) efiSysMountPoint canTouchEfiVariables; };