public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: Fix priorities of initialHashedPassword.

Browse Source 
Regression introduced in f496c3cbe4.

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 <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-11-04 05:19:07 +01:00
parent 0f26e580bb
commit 8e516de3e7
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/testing/test-instrumentation.nix
View File

@ -98,7 +98,7 @@ let kernel = config.boot.kernelPackages.kernel; in
networking.usePredictableInterfaceNames = false; networking.usePredictableInterfaceNames = false;
# Make it easy to log in as root when running the test interactively. # Make it easy to log in as root when running the test interactively.
users.extraUsers.root.initialHashedPassword = mkDefault ""; users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
}; };

2
nixos/modules/virtualisation/docker-image.nix
View File

@ -56,7 +56,7 @@ in {
services.openssh.startWhenNeeded = false; services.openssh.startWhenNeeded = false;
# Allow the user to login as root without password. # Allow the user to login as root without password.
users.extraUsers.root.initialHashedPassword = mkDefault ""; users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
# Some more help text. # Some more help text.
services.mingetty.helpLine = services.mingetty.helpLine =