public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6601 from joachifm/gardening

Browse Source 
nixos: some gardening
This commit is contained in:
Jaka Hudoklin 2015-02-28 12:05:58 +01:00
commit 29d0d78e7e
6 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/system/boot/loader/generations-dir/generations-dir.nix
View File

@ -24,6 +24,7 @@ in
enable = mkOption { enable = mkOption {
default = false; default = false;
type = types.bool;
description = '' description = ''
Whether to create symlinks to the system generations under Whether to create symlinks to the system generations under
<literal>/boot</literal>. When enabled, <literal>/boot</literal>. When enabled,
@ -42,6 +43,7 @@ in
copyKernels = mkOption { copyKernels = mkOption {
default = false; default = false;
type = types.bool;
description = " description = "
Whether copy the necessary boot files into /boot, so Whether copy the necessary boot files into /boot, so
/nix/store is not needed by the boot loader. /nix/store is not needed by the boot loader.

1
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -179,6 +179,7 @@ in
}; };
splashImage = mkOption { splashImage = mkOption {
type = types.nullOr types.path;
example = literalExample "./my-background.png"; example = literalExample "./my-background.png";
description = '' description = ''
Background image used for GRUB. It must be a 640x480, Background image used for GRUB. It must be a 640x480,

1
nixos/modules/system/boot/loader/init-script/init-script.nix
View File

@ -23,6 +23,7 @@ in
enable = mkOption { enable = mkOption {
default = false; default = false;
type = types.bool;
description = '' description = ''
Some systems require a /sbin/init script which is started. Some systems require a /sbin/init script which is started.
Or having it makes starting NixOS easier. Or having it makes starting NixOS easier.

1
nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
View File

@ -21,6 +21,7 @@ in
boot.loader.raspberryPi.enable = mkOption { boot.loader.raspberryPi.enable = mkOption {
default = false; default = false;
type = types.bool;
description = '' description = ''
Whether to create files with the system generations in Whether to create files with the system generations in
<literal>/boot</literal>. <literal>/boot</literal>.

1
nixos/modules/tasks/kbd.nix
View File

@ -22,6 +22,7 @@ in
# FIXME: still needed? # FIXME: still needed?
boot.extraTTYs = mkOption { boot.extraTTYs = mkOption {
default = []; default = [];
type = types.listOf types.string;
example = ["tty8" "tty9"]; example = ["tty8" "tty9"];
description = '' description = ''
Tty (virtual console) devices, in addition to the consoles on Tty (virtual console) devices, in addition to the consoles on

11
nixos/modules/virtualisation/lxc.nix
View File

@ -32,7 +32,9 @@ in
default = ""; default = "";
description = description =
'' ''
This is the system-wide LXC config. See lxc.system.conf(5). This is the system-wide LXC config. See
<citerefentry><refentrytitle>lxc.system.conf</refentrytitle>
<manvolnum>5</manvolnum></citerefentry>.
''; '';
}; };
@ -43,7 +45,8 @@ in
description = description =
'' ''
Default config (default.conf) for new containers, i.e. for Default config (default.conf) for new containers, i.e. for
network config. See lxc.container.conf(5). network config. See <citerefentry><refentrytitle>lxc.container.conf
</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
''; '';
}; };
@ -54,7 +57,9 @@ in
description = description =
'' ''
This is the config file for managing unprivileged user network This is the config file for managing unprivileged user network
administration access in LXC. See lxc-user-net(5). administration access in LXC. See <citerefentry>
<refentrytitle>lxc-user-net</refentrytitle><manvolnum>5</manvolnum>
</citerefentry>.
''; '';
}; };