diff options
author | Bob van der Linden <bobvanderlinden@gmail.com> | 2018-08-06 21:09:47 +0200 |
---|---|---|
committer | Silvan Mosberger <infinisil@icloud.com> | 2018-08-07 14:45:50 +0200 |
commit | e1da32d88787ba773733ff00286aeb4c2c2daf04 (patch) | |
tree | d6ccdc63c8e040157676758bfbda1dbd32c86c55 | |
parent | 47e51aad09037094430297a0b51c58f00f97d1bc (diff) |
set initialHashedPassword in installation-device.nix
6 files changed, 4 insertions, 15 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 36024ce9f45ef..1453e8082b0dd 100644 --- 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"; } diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 4eb28434e192a..bd6cf029967cb 100644 --- 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" '' diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 0d595503f1933..0c89eb533359b 100644 --- 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" '' diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index aa52844288ca9..78ea3f1a205c8 100644 --- 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" '' diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix index da7d760ad2fc0..7e66a49c73919 100644 --- 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 = ""; } diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 43f06c219f824..57d947b526847 100644 --- 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 = ""; }; } |