diff options
author | matix2267 <matix2267@gmail.com> | 2019-03-05 03:27:15 +0100 |
---|---|---|
committer | Danylo Hlynskyi <abcz2.uprola@gmail.com> | 2019-03-05 04:27:15 +0200 |
commit | 6ab2aea0035a3540feb126b72b0568b874b97225 (patch) | |
tree | 3a8110d00492ac3269c6a86f6fdb2baebf9c8fee | |
parent | b421183b34799b9290313254b982fb9ae1db7711 (diff) | |
download | nixpkgs-6ab2aea0035a3540feb126b72b0568b874b97225.tar nixpkgs-6ab2aea0035a3540feb126b72b0568b874b97225.tar.gz nixpkgs-6ab2aea0035a3540feb126b72b0568b874b97225.tar.bz2 nixpkgs-6ab2aea0035a3540feb126b72b0568b874b97225.tar.lz nixpkgs-6ab2aea0035a3540feb126b72b0568b874b97225.tar.xz nixpkgs-6ab2aea0035a3540feb126b72b0568b874b97225.tar.zst nixpkgs-6ab2aea0035a3540feb126b72b0568b874b97225.zip |
nixos/doc: Small updates about wireless configuration. (#55918)
* Reference networking section from installation * Add info about pskRaw option in networking.wireless.networks
-rw-r--r-- | nixos/doc/manual/configuration/wireless.xml | 21 | ||||
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 4 |
2 files changed, 23 insertions, 2 deletions
diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index f7e99ff0e35..dda2193dd93 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -36,8 +36,25 @@ </para> <para> - If you are using WPA2 the <command>wpa_passphrase</command> tool might be - useful to generate the <literal>wpa_supplicant.conf</literal>. + If you are using WPA2 you can generate pskRaw key using + <command>wpa_passphrase</command>: +<screen> +$ wpa_passphrase ESSID PSK +network={ + ssid="echelon" + #psk="abcdefgh" + psk=dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435 +} +</screen> +<programlisting> +<xref linkend="opt-networking.wireless.networks"/> = { + echelon = { + pskRaw = "dca6d6ed41f4ab5a984c9f55f6f66d4efdc720ebf66959810f4329bb391c5435"; + }; +} +</programlisting> + or you can use it to directly generate the + <literal>wpa_supplicant.conf</literal>: <screen> # wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen> After you have edited the <literal>wpa_supplicant.conf</literal>, you need to diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 8e94f946c5e..f4f8d470f80 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -378,6 +378,10 @@ the grub menu. </para> <para> + If you need to configure networking for your machine the configuration + options are described in <xref linkend="sec-networking"/>. + </para> + <para> Another critical option is <option>fileSystems</option>, specifying the file systems that need to be mounted by NixOS. However, you typically don’t need to set it yourself, because |