1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
nixpkgs/nixos
Josh Cartwright 626a666da5 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 <joshc@eso.teric.us>
2014-09-03 05:36:45 +02:00
..
doc/manual Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6"" 2014-08-31 09:46:16 -07:00
gui Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
lib Revert "Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c"" 2014-08-31 09:46:26 -07:00
maintainers Replace depricated gcutil with gcloude compute in gce/create-gce.sh 2014-08-28 21:42:49 +00:00
modules gummiboot/builder: fix timeout setting when unset 2014-09-03 05:36:45 +02:00
tests nixos/tests: Fix usage of head function without pkgs.lib 2014-09-01 04:39:45 -07:00
COPYING Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
default.nix Fix nixos-option 2013-10-28 22:45:58 +01:00
README Move all of NixOS to nixos/ in preparation of the repository merge 2013-10-10 13:28:20 +02:00
release-combined.nix Revert "Merge pull request #2449 from wkennington/master.grub" 2014-08-31 12:58:37 +04:00
release.nix Revert "Merge pull request #2449 from wkennington/master.grub" 2014-08-31 12:58:37 +04:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.