Merge pull request #63773 from flokli/installation-device-fixes

installation-device.nix: explain sshd usage, don't include clone-config

nixos/doc/manual/configuration/profiles/clone-config.xml

@@ -11,4 +11,11 @@
   creating the image in the first place. As a result it allows users to edit
   and rebuild the live-system.
  </para>
+
+ <para>
+  On images where the installation media also becomes an installation target,
+  copying over <literal>configuration.nix</literal> should be disabled by
+  setting <literal>installer.cloneConfig</literal> to <literal>false</literal>.
+  This is already done in <literal>sd-image.nix</literal>.
+ </para>
 </section>

nixos/doc/manual/configuration/profiles/installation-device.xml

@@ -6,33 +6,31 @@
  <title>Installation Device</title>
 
  <para>
-  Provides a basic configuration for installation devices like CDs. This means
+  Provides a basic configuration for installation devices like CDs.
-  enabling hardware scans, using the <link linkend="sec-profile-clone-config">
+  This enables redistributable firmware, includes the
-  Clone Config profile</link> to guarantee
+  <link linkend="sec-profile-clone-config">Clone Config profile</link>
-  <filename>/etc/nixos/configuration.nix</filename> exists (for
+  and a copy of the Nixpkgs channel, so <command>nixos-install</command>
-  <command>nixos-rebuild</command> to work), a copy of the Nixpkgs channel
+  works out of the box.
-  snapshot used to create the install media.
  </para>
-
  <para>
-  Additionally, documentation for <link linkend="opt-documentation.enable">
+  Documentation for <link linkend="opt-documentation.enable">Nixpkgs</link>
-  Nixpkgs</link> and <link linkend="opt-documentation.nixos.enable">NixOS
+  and <link linkend="opt-documentation.nixos.enable">NixOS</link> are
-  </link> are forcefully enabled (to override the
+  forcefully enabled (to override the
   <link linkend="sec-profile-minimal">Minimal profile</link> preference); the
-  NixOS manual is shown automatically on TTY 8, sudo and udisks are disabled.
+  NixOS manual is shown automatically on TTY 8, udisks is disabled.
-  Autologin is enabled as root.
+  Autologin is enabled as <literal>nixos</literal> user, while passwordless
+  login as both <literal>root</literal> and <literal>nixos</literal> is possible.
+  Passwordless <command>sudo</command> is enabled too.
+  <link linkend="opt-networking.wireless.enable">wpa_supplicant</link> is
+  enabled, but configured to not autostart.
+ </para>
+ <para>
+  It is explained how to login, start the ssh server, and if available,
+  how to start the display manager.
  </para>
 
  <para>
-  A message is shown to the user to start a display manager if needed, ssh with
+  Several settings are tweaked so that the installer has a better chance of
-  <xref linkend="opt-services.openssh.permitRootLogin"/> are enabled (but
+  succeeding under low-memory environments.
-  doesn't autostart). WPA Supplicant is also enabled without autostart.
- </para>
-
- <para>
-  Finally, vim is installed, root is set to not have a password, the kernel is
-  made more silent for remote public IP installs, and several settings are
-  tweaked so that the installer has a better chance of succeeding under
-  low-memory environments.
  </para>
 </section>

nixos/modules/installer/cd-dvd/sd-image.nix

@@ -194,5 +194,9 @@ in
         rm -f /nix-path-registration
       fi
     '';
+
+    # the installation media is also the installation target,
+    # so we don't want to provide the installation configuration.nix.
+    installer.cloneConfig = false;
   };
 }

nixos/modules/profiles/installation-device.nix

@@ -55,13 +55,16 @@ with lib;
     services.mingetty.autologinUser = "nixos";
 
     # Some more help text.
-    services.mingetty.helpLine =
+    services.mingetty.helpLine = ''
-      ''
+      The "nixos" and "root" accounts have empty passwords.
 
-        The "nixos" and "root" account have empty passwords.  ${
+      Type `sudo systemctl start sshd` to start the SSH daemon.
-          optionalString config.services.xserver.enable
+      You then must set a password for either "root" or "nixos"
-            "Type `sudo systemctl start display-manager' to\nstart the graphical user interface."}
+      with `passwd` to be able to login.
-      '';
+    '' + optionalString config.services.xserver.enable ''
+      Type `sudo systemctl start display-manager' to
+      start the graphical user interface.
+    '';
 
     # Allow sshd to be started manually through "systemctl start sshd".
     services.openssh = {