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

Make initialRootPassword overrideable in all virtualisation modules, not just virtualbox.

Browse Source
This commit is contained in:
Rickard Nilsson 2014-02-24 18:05:26 +01:00
parent 51c9dbc9f3
commit d5211b0e0e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,5 +164,5 @@ with pkgs.lib;
# Prevent logging in as root without a password. This doesn't really matter,
# since the only PAM services that allow logging in with a null
# password are local ones that are inaccessible on EC2 machines.
security.initialRootPassword = "!";
security.initialRootPassword = mkDefault "!";
}

4
nixos/modules/virtualisation/containers.nix
View File

@ -55,7 +55,7 @@ with pkgs.lib;
modules =
let extraConfig =
{ boot.isContainer = true;
security.initialRootPassword = "!";
security.initialRootPassword = mkDefault "!";
networking.hostName = mkDefault name;
};
in [ extraConfig config.config ];
@ -134,4 +134,4 @@ with pkgs.lib;
}) config.systemd.containers;
};
}
}

2
nixos/modules/virtualisation/google-compute-image.nix
View File

@ -114,7 +114,7 @@ with pkgs.lib;
# Prevent logging in as root without a password. This doesn't really matter,
# since the only PAM services that allow logging in with a null
# password are local ones that are inaccessible on Google Compute machines.
security.initialRootPassword = "!";
security.initialRootPassword = mkDefault "!";
# Configure default metadata hostnames
networking.extraHosts = ''