alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge PR #5772, boot.loader.timeout

Browse source
This commit is contained in:
Luca Bruno 2015-01-30 10:36:26 +01:00
parent 3c7e1ef698 a3d5f4f3ef
commit a239775488
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/module-list.nix
View file

@ -372,6 +372,7 @@
./system/boot/kernel.nix
./system/boot/kexec.nix
./system/boot/loader/efi.nix
./system/boot/loader/loader.nix
./system/boot/loader/generations-dir/generations-dir.nix
./system/boot/loader/grub/grub.nix
./system/boot/loader/grub/ipxe.nix

2
nixos/modules/system/boot/loader/grub/grub.nix
View file

@ -196,7 +196,7 @@ in
};
timeout = mkOption {
default = 5;
default = if (config.boot.loader.timeout != null) then config.boot.loader.timeout else -1;
type = types.int;
description = ''
Timeout (in seconds) until GRUB boots the default menu item.

2
nixos/modules/system/boot/loader/gummiboot/gummiboot.nix
View file

@ -31,7 +31,7 @@ in {
};
timeout = mkOption {
default = null;
default = if config.boot.loader.timeout == null then 10000 else config.boot.loader.timeout;
example = 4;

15
nixos/modules/system/boot/loader/loader.nix Normal file
View file

@ -0,0 +1,15 @@
{ config, lib, pkgs, ... }:
with lib;
{
options = {
boot.loader.timeout = mkOption {
default = 5;
type = types.nullOr types.int;
description = ''
Timeout (in seconds) until loader boots the default menu item. Use null if the loader menu should be displayed indefinitely.
'';
};
};
}