summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2019-12-02 23:24:02 +0100
committerGitHub <noreply@github.com>2019-12-02 23:24:02 +0100
commit9159afd4593ed298e9a398a350472effdcb16c58 (patch)
tree91b39739b243c7ddf90a55bb3e41406f7f873959 /nixos
parent0d534c07405f63216b5346a7ffa0075430993f1e (diff)
parent89ed88f86faa832e98dbbe518f895b3596b55ece (diff)
downloadnixpkgs-9159afd4593ed298e9a398a350472effdcb16c58.tar
nixpkgs-9159afd4593ed298e9a398a350472effdcb16c58.tar.gz
nixpkgs-9159afd4593ed298e9a398a350472effdcb16c58.tar.bz2
nixpkgs-9159afd4593ed298e9a398a350472effdcb16c58.tar.lz
nixpkgs-9159afd4593ed298e9a398a350472effdcb16c58.tar.xz
nixpkgs-9159afd4593ed298e9a398a350472effdcb16c58.tar.zst
nixpkgs-9159afd4593ed298e9a398a350472effdcb16c58.zip
Merge pull request #74839 from raboof/installNetworkingNote
Spell out you need to enable wifi explicitly at install time
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/installation/installing.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 7991c43e01f..5655295871e 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -380,7 +380,10 @@
     </para>
     <para>
      If you need to configure networking for your machine the configuration
-     options are described in <xref linkend="sec-networking"/>.
+     options are described in <xref linkend="sec-networking"/>. In particular,
+     while wifi is supported on the installation image, it is not enabled by
+     default in the configuration generated by
+     <command>nixos-generate-config</command>.
     </para>
     <para>
      Another critical option is <option>fileSystems</option>, specifying the