summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-11-21 22:29:10 +0100
committerDomen Kožar <domen@dev.si>2014-11-21 22:29:10 +0100
commit85daeeb2222118602a4d59777a168d010b456cd3 (patch)
treeb2cb15a6d067e79efbf9a62ba890d4069a9467c3 /nixos/doc
parent5c7c63af66d5b772d97d5ffda09df9cf2ef96f8b (diff)
parent7dbf4d73c7f21714ca41af268e21019eaf06ccfd (diff)
downloadnixlib-85daeeb2222118602a4d59777a168d010b456cd3.tar
nixlib-85daeeb2222118602a4d59777a168d010b456cd3.tar.gz
nixlib-85daeeb2222118602a4d59777a168d010b456cd3.tar.bz2
nixlib-85daeeb2222118602a4d59777a168d010b456cd3.tar.lz
nixlib-85daeeb2222118602a4d59777a168d010b456cd3.tar.xz
nixlib-85daeeb2222118602a4d59777a168d010b456cd3.tar.zst
nixlib-85daeeb2222118602a4d59777a168d010b456cd3.zip
Merge pull request #4639 from lethalman/installer-nm
kde installer: enable networkmanager. Closes #3433
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/installation/installing.xml19
1 files changed, 12 insertions, 7 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index b140c56fbee1..dd1acba2168e 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -11,14 +11,9 @@
   <listitem><para>Boot from the CD.</para></listitem>
 
   <listitem><para>The CD contains a basic NixOS installation.  (It
-  also contains Memtest86+, useful if you want to test new hardware.)
+  also contains Memtest86+, useful if you want to test new hardware).
   When it’s finished booting, it should have detected most of your
-  hardware and brought up networking (check
-  <command>ifconfig</command>).  Networking is necessary for the
-  installer, since it will download lots of stuff (such as source
-  tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
-  server on your network.  Otherwise configure networking manually
-  using <command>ifconfig</command>.</para></listitem>
+  hardware.</para></listitem>
 
   <listitem><para>The NixOS manual is available on virtual console 8
   (press Alt+F8 to access).</para></listitem>
@@ -29,6 +24,16 @@
   <listitem><para>If you downloaded the graphical ISO image, you can
   run <command>start display-manager</command> to start KDE.</para></listitem>
 
+  <listitem><para>The boot process should have brought up networking (check
+  <command>ifconfig</command>).  Networking is necessary for the
+  installer, since it will download lots of stuff (such as source
+  tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
+  server on your network. Otherwise configure networking manually
+  using <command>ifconfig</command>.</para>
+  <para>To manually configure the network on the graphical installer,
+  first disable NetworkManager with
+  <command>stop NetworkManager</command>.</para></listitem>
+
   <listitem><para>The NixOS installer doesn’t do any partitioning or
   formatting yet, so you need to that yourself.  Use the following
   commands: