about summary refs log tree commit diff
path: root/nixos/doc/manual/installation
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-08-14 11:20:54 -0400
committerGitHub <noreply@github.com>2019-08-14 11:20:54 -0400
commitdd49cf711e3139fec2eca26f31c2ffd8b5c5873b (patch)
treeff29fd24eb8f097dc600fd042ed133d4d07665d9 /nixos/doc/manual/installation
parent8f156698bf1ce6de300be90c2239a140ca43e523 (diff)
parent15f5535430ea8e9150471e91b6f71e6b55029508 (diff)
downloadnixlib-dd49cf711e3139fec2eca26f31c2ffd8b5c5873b.tar
nixlib-dd49cf711e3139fec2eca26f31c2ffd8b5c5873b.tar.gz
nixlib-dd49cf711e3139fec2eca26f31c2ffd8b5c5873b.tar.bz2
nixlib-dd49cf711e3139fec2eca26f31c2ffd8b5c5873b.tar.lz
nixlib-dd49cf711e3139fec2eca26f31c2ffd8b5c5873b.tar.xz
nixlib-dd49cf711e3139fec2eca26f31c2ffd8b5c5873b.tar.zst
nixlib-dd49cf711e3139fec2eca26f31c2ffd8b5c5873b.zip
Merge pull request #66338 from worldofpeace/installer/no-root
installer: Don't run as root
Diffstat (limited to 'nixos/doc/manual/installation')
-rw-r--r--nixos/doc/manual/installation/installing.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 742376378dea..e5fb95f7dcf0 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -29,13 +29,14 @@
   </para>
 
   <para>
-   You are logged-in automatically as <literal>root</literal>. (The
-   <literal>root</literal> user account has an empty password.)
+   You are logged-in automatically as <literal>nixos</literal>.
+   The <literal>nixos</literal> user account has an empty password so you
+   can use <command>sudo</command> without a password.
   </para>
 
   <para>
    If you downloaded the graphical ISO image, you can run <command>systemctl
-   start display-manager</command> to start KDE. If you want to continue on the
+   start display-manager</command> to start the desktop environment. If you want to continue on the
    terminal, you can use <command>loadkeys</command> to switch to your
    preferred keyboard layout. (We even provide neo2 via <command>loadkeys de
    neo</command>!)
@@ -65,9 +66,9 @@
 
    <para>
     If you would like to continue the installation from a different machine you
-    need to activate the SSH daemon via <literal>systemctl start
-    sshd</literal>. In order to be able to login you also need to set a
-    password for <literal>root</literal> using <literal>passwd</literal>.
+    need to activate the SSH daemon via <command>systemctl start
+    sshd</command>. You then must set a password for either <literal>root</literal> or
+    <literal>nixos</literal> with <command>passwd></command> to be able to login.
    </para>
   </section>
  </section>