diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-01 15:42:18 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-03 16:35:36 +0200 |
| commit | fee81c37398f547faddfff7ee10d945bb4513f09 (patch) | |
| tree | 7bf4e901a34619b8682863c603ce306847513b4f /nixos/modules | |
| parent | 6da72a4456ea7cc12219c962739f279e5060fd66 (diff) | |
| download | nixlib-fee81c37398f547faddfff7ee10d945bb4513f09.tar nixlib-fee81c37398f547faddfff7ee10d945bb4513f09.tar.gz nixlib-fee81c37398f547faddfff7ee10d945bb4513f09.tar.bz2 nixlib-fee81c37398f547faddfff7ee10d945bb4513f09.tar.lz nixlib-fee81c37398f547faddfff7ee10d945bb4513f09.tar.xz nixlib-fee81c37398f547faddfff7ee10d945bb4513f09.tar.zst nixlib-fee81c37398f547faddfff7ee10d945bb4513f09.zip | |
Always enable container logins
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/container-login.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/nixos-container.pl | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1c2fca1f88b5..a7bf69cfc792 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -294,6 +294,7 @@ ./tasks/scsi-link-power-management.nix ./tasks/swraid.nix ./testing/service-runner.nix + ./virtualisation/container-login.nix ./virtualisation/containers.nix ./virtualisation/libvirtd.nix #./virtualisation/nova.nix diff --git a/nixos/modules/virtualisation/container-login.nix b/nixos/modules/virtualisation/container-login.nix index 09eaf90ae658..fb5e333b32ab 100644 --- a/nixos/modules/virtualisation/container-login.nix +++ b/nixos/modules/virtualisation/container-login.nix @@ -1,8 +1,10 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: + +with lib; { - config = { + config = mkIf config.boot.isContainer { # Provide a login prompt on /var/lib/login.socket. On the host, # you can connect to it by running ‘socat diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 9964cd431cd7..6c8a6f876c8d 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -105,7 +105,6 @@ in security.initialRootPassword = mkDefault "!"; networking.hostName = mkDefault name; networking.useDHCP = false; - imports = [ ./container-login.nix ]; }; in [ extraConfig config.config ]; prefix = [ "containers" name ]; diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index dfc856e8b667..b08ed0766583 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -116,7 +116,6 @@ with pkgs.lib; security.initialRootPassword = mkDefault "!"; networking.hostName = mkDefault "$containerName"; networking.useDHCP = false; - imports = [ <nixpkgs/nixos/modules/virtualisation/container-login.nix> ]; $extraConfig } EOF |