set initialHashedPassword in installation-device.nix

6 years ago · e1da32d887
parent 47e51aad09
commit e1da32d887
6 changed files with 4 additions and 15 deletions
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@ -29,8 +29,5 @@ with lib;
  # Add Memtest86+ to the CD.
  boot.loader.grub.memtest86.enable = true;

-  # Allow the user to log in as root without a password.
-  users.users.root.initialHashedPassword = "";
-
  system.stateVersion = mkDefault "18.03";
 }
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@ -33,9 +33,6 @@ in
  # Also increase the amount of CMA to ensure the virtual console on the RPi3 works.
  boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];

-  # FIXME: this probably should be in installation-device.nix
-  users.users.root.initialHashedPassword = "";
-
  sdImage = {
    populateBootCommands = let
      configTxt = pkgs.writeText "config.txt" ''
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@ -34,9 +34,6 @@ in
  # - ttySAC2: for Exynos (ODROID-XU3)
  boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"];

-  # FIXME: this probably should be in installation-device.nix
-  users.users.root.initialHashedPassword = "";
-
  sdImage = {
    populateBootCommands = let
      configTxt = pkgs.writeText "config.txt" ''
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@ -27,9 +27,6 @@ in
  boot.consoleLogLevel = lib.mkDefault 7;
  boot.kernelPackages = pkgs.linuxPackages_rpi;

-  # FIXME: this probably should be in installation-device.nix
-  users.users.root.initialHashedPassword = "";
-
  sdImage = {
    populateBootCommands = let
      configTxt = pkgs.writeText "config.txt" ''
--- a/nixos/modules/installer/netboot/netboot-base.nix
+++ b/nixos/modules/installer/netboot/netboot-base.nix
@ -14,7 +14,4 @@ with lib;
      ../../profiles/base.nix
      ../../profiles/installation-device.nix
    ];
-
-  # Allow the user to log in as root without a password.
-  users.users.root.initialHashedPassword = "";
 }
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@ -86,5 +86,9 @@ with lib;
    networking.firewall.logRefusedConnections = mkDefault false;

    environment.systemPackages = [ pkgs.vim ];
+
+
+    # Allow the user to log in as root without a password.
+    users.users.root.initialHashedPassword = "";
  };
 }