diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-04 20:17:44 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-04 20:17:44 +0400 |
| commit | 1a0d437bf3456c0774d924c1762ddb1cb0b561b9 (patch) | |
| tree | bfa84f9d0ee987da5364dbcf0d16903f6b406217 | |
| parent | 6b0e800d49f57ed4fb0c99a6cd8b760b1dd6ca85 (diff) | |
| parent | 626a666da53229e463549bca0d24e2b21a4801cd (diff) | |
| download | nixpkgs-1a0d437bf3456c0774d924c1762ddb1cb0b561b9.tar nixpkgs-1a0d437bf3456c0774d924c1762ddb1cb0b561b9.tar.gz nixpkgs-1a0d437bf3456c0774d924c1762ddb1cb0b561b9.tar.bz2 nixpkgs-1a0d437bf3456c0774d924c1762ddb1cb0b561b9.tar.lz nixpkgs-1a0d437bf3456c0774d924c1762ddb1cb0b561b9.tar.xz nixpkgs-1a0d437bf3456c0774d924c1762ddb1cb0b561b9.tar.zst nixpkgs-1a0d437bf3456c0774d924c1762ddb1cb0b561b9.zip | |
Merge pull request #3944 from joshcartwright/gummiboot-timeout-fix
gummiboot/builder: fix timeout setting when unset
| -rw-r--r-- | nixos/modules/system/boot/loader/gummiboot/gummiboot.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix b/nixos/modules/system/boot/loader/gummiboot/gummiboot.nix index e7a481e90a7..003f72b37f9 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; }; |