diff options
author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2015-02-17 22:14:29 +0100 |
---|---|---|
committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2015-02-17 22:16:20 +0100 |
commit | 2fe44b95d088067bb6a2a144300f3ae898185a1d (patch) | |
tree | 61a9a257b7ad5b886a0b04ec1232118ab6056e33 /nixos | |
parent | 0e63ac0acf9cc7dfaafae81237cabf9930a744eb (diff) | |
download | nixpkgs-2fe44b95d088067bb6a2a144300f3ae898185a1d.tar nixpkgs-2fe44b95d088067bb6a2a144300f3ae898185a1d.tar.gz nixpkgs-2fe44b95d088067bb6a2a144300f3ae898185a1d.tar.bz2 nixpkgs-2fe44b95d088067bb6a2a144300f3ae898185a1d.tar.lz nixpkgs-2fe44b95d088067bb6a2a144300f3ae898185a1d.tar.xz nixpkgs-2fe44b95d088067bb6a2a144300f3ae898185a1d.tar.zst nixpkgs-2fe44b95d088067bb6a2a144300f3ae898185a1d.zip |
nixos/wpa_supplicant: fix conflicting documentation
fixes #6298
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/networking/wpa_supplicant.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 771eeecd772..e2d34ea079c 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -31,12 +31,14 @@ in description = '' Whether to start <command>wpa_supplicant</command> to scan for and associate with wireless networks. Note: NixOS currently - does not generate <command>wpa_supplicant</command>'s + does not manage <command>wpa_supplicant</command>'s configuration file, <filename>${configFile}</filename>. You should edit this file yourself to define wireless networks, WPA keys and so on (see <citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle> - <manvolnum>5</manvolnum></citerefentry>). + <manvolnum>5</manvolnum></citerefentry>), or use + networking.wireless.userControlled.* to allow users to add entries + through <command>wpa_cli</command> and <command>wpa_gui</command>. ''; }; @@ -62,7 +64,9 @@ in default = false; description = '' Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli. - This is useful for laptop users that switch networks a lot. + This is useful for laptop users that switch networks a lot and don't want + to depend on a large package such as NetworkManager just to pick nearby + access points. When you want to use this, make sure ${configFile} doesn't exist. It will be created for you. |