From e1da32d88787ba773733ff00286aeb4c2c2daf04 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 6 Aug 2018 21:09:47 +0200 Subject: set initialHashedPassword in installation-device.nix --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 3 --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 3 --- nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 3 --- nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 3 --- nixos/modules/installer/netboot/netboot-base.nix | 3 --- 5 files changed, 15 deletions(-) (limited to 'nixos/modules/installer') diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 36024ce9f45e..1453e8082b0d 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 4eb28434e192..bd6cf029967c 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 0d595503f193..0c89eb533359 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 aa52844288ca..78ea3f1a205c 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 da7d760ad2fc..7e66a49c7391 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 = ""; } -- cgit 1.4.1