From 8e516de3e76ce489271161b7fd8291edfb0adf40 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 4 Nov 2014 05:19:07 +0100 Subject: [PATCH] nixos: Fix priorities of initialHashedPassword. Regression introduced in f496c3cbe4a6a2db88892d14609618e449744ed6. Previously when we used security.initialRootPassword, the default priority for this option was 1001, because it was a default value set by the option itself. With the mentioned commit, it is no longer an option default but a mkDefault, which is priority 1000. I'm setting this to 150 now, as test-instrumentation.nix is using this for overriding other options and because I think it still makes it possible to simple-override it, because if no priority is given, we get priority 100. Signed-off-by: aszlig --- nixos/modules/testing/test-instrumentation.nix | 2 +- nixos/modules/virtualisation/docker-image.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 2de978ca1018..4b4284d85319 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -98,7 +98,7 @@ let kernel = config.boot.kernelPackages.kernel; in networking.usePredictableInterfaceNames = false; # Make it easy to log in as root when running the test interactively. - users.extraUsers.root.initialHashedPassword = mkDefault ""; + users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; }; diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix index ff276fc86a8e..cabb1712b6c0 100644 --- a/nixos/modules/virtualisation/docker-image.nix +++ b/nixos/modules/virtualisation/docker-image.nix @@ -56,7 +56,7 @@ in { services.openssh.startWhenNeeded = false; # Allow the user to login as root without password. - users.extraUsers.root.initialHashedPassword = mkDefault ""; + users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; # Some more help text. services.mingetty.helpLine =