diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-06 16:51:14 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-06 16:52:45 +0200 |
commit | 06fea81c6e3d71689b59df6e2bbc11fe01ce9056 (patch) | |
tree | 5849b904bf1eb3bc8cb28b29729d83a4d0337542 /nixos/doc | |
parent | 20be024d1bae622409fa56844b2f8799bbf29bb0 (diff) | |
parent | 0c398f60405090743fbdcf14faf1193c642b6328 (diff) | |
download | nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.gz nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.bz2 nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.lz nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.xz nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.zst nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.zip |
Merge recent master into staging
Hydra: ?compare=1150594
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/man-nixos-option.xml | 66 |
1 files changed, 9 insertions, 57 deletions
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml index 7952847d4db5..554b29691805 100644 --- a/nixos/doc/manual/man-nixos-option.xml +++ b/nixos/doc/manual/man-nixos-option.xml @@ -17,11 +17,6 @@ <refsynopsisdiv> <cmdsynopsis> <command>nixos-option</command> - <group choice="opt"> - <option>-v</option> - <option>-d</option> - <option>-l</option> - </group> <arg choice='plain'><replaceable>option.name</replaceable></arg> </cmdsynopsis> </refsynopsisdiv> @@ -31,50 +26,13 @@ <para>This command evaluates the configuration specified in <filename>/etc/nixos/configuration.nix</filename> and returns the properties -of the option name given as argument. By default, it returns the value of -the option.</para> +of the option name given as argument.</para> <para>When the option name is not an option, the command prints the list of attributes contained in the attribute set.</para> </refsection> -<refsection><title>Options</title> - -<para>This command accepts the following options:</para> - -<variablelist> - - <varlistentry> - <term><option>--value</option>, <option>-v</option></term> - <listitem> - <para>Returns the value of the option. This is the default operation - if no other options are defined.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><option>--description</option>, <option>-d</option></term> - <listitem> - <para>Return the default value, the example and the description of the - option when available.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><option>--lookup</option>, <option>-l</option></term> - <listitem> - <para>Return the locations where the option is declared and where it - is defined. This is extremely useful to find sources of errors in - your configuration.</para> - </listitem> - </varlistentry> - -</variablelist> - -</refsection> - - <refsection><title>Environment</title> <variablelist> @@ -103,27 +61,21 @@ grub initScript $ nixos-option boot.loader.grub.enable -true</screen></para> +Value: +true -<para>Prints option information: +Default: +true -<screen>$ nixos-option -d networking.hostName -Default: "nixos" Description: -The name of the machine. Leave it empty if you want to obtain -it from a DHCP server (if using DHCP).</screen></para> - -<para>Find the locations which are declaring and defining an option: +Whether to enable the GNU GRUB boot loader. -<screen>$ nixos-option -l hardware.firmware Declared by: - /mnt/data/nix-sources/nixos/modules/services/hardware/udev.nix + "/path/to/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" Defined by: - /path/to/nixpkgs/nixos/modules/system/boot/kernel.nix - /path/to/nixpkgs/nixos/modules/hardware/network/rt73.nix - /path/to/nixpkgs/nixos/modules/hardware/network/intel-3945abg.nix - /path/to/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix</screen></para> + "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix" +</screen></para> </refsection> |