diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2014-02-24 18:05:26 +0100 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2014-02-24 18:05:26 +0100 |
| commit | d5211b0e0e45c840d415733b56d9be93224f1616 (patch) | |
| tree | 9d368a0518ed7d09fd2330662f4e8b4ddc912da1 /nixos/modules/virtualisation | |
| parent | 51c9dbc9f3ad4cf3142d0e50b040f4ba14b84ad2 (diff) | |
| download | nixpkgs-d5211b0e0e45c840d415733b56d9be93224f1616.tar nixpkgs-d5211b0e0e45c840d415733b56d9be93224f1616.tar.gz nixpkgs-d5211b0e0e45c840d415733b56d9be93224f1616.tar.bz2 nixpkgs-d5211b0e0e45c840d415733b56d9be93224f1616.tar.lz nixpkgs-d5211b0e0e45c840d415733b56d9be93224f1616.tar.xz nixpkgs-d5211b0e0e45c840d415733b56d9be93224f1616.tar.zst nixpkgs-d5211b0e0e45c840d415733b56d9be93224f1616.zip | |
Make initialRootPassword overrideable in all virtualisation modules, not just virtualbox.
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/google-compute-image.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index abd2a1084bd..99d6f927ef0 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -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 "!"; } diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index bcbfaacd703..d87284de4fc 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -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; }; -} \ No newline at end of file +} diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 098c9ede853..634932ff007 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -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 = '' |