movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-09 12:05:50 +03:00
Code Activity

Always enable container logins

Browse source
This commit is contained in:
Eelco Dolstra 2014-04-01 15:42:18 +02:00
parent 6da72a4456
commit fee81c3739
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/module-list.nix
View file

@ -294,6 +294,7 @@
./tasks/scsi-link-power-management.nix ./tasks/scsi-link-power-management.nix
./tasks/swraid.nix ./tasks/swraid.nix
./testing/service-runner.nix ./testing/service-runner.nix
./virtualisation/container-login.nix
./virtualisation/containers.nix ./virtualisation/containers.nix
./virtualisation/libvirtd.nix ./virtualisation/libvirtd.nix
#./virtualisation/nova.nix #./virtualisation/nova.nix

6
nixos/modules/virtualisation/container-login.nix
View file

@ -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, # Provide a login prompt on /var/lib/login.socket. On the host,
# you can connect to it by running ‘socat # you can connect to it by running ‘socat

1
nixos/modules/virtualisation/containers.nix
View file

@ -105,7 +105,6 @@ in
security.initialRootPassword = mkDefault "!"; security.initialRootPassword = mkDefault "!";
networking.hostName = mkDefault name; networking.hostName = mkDefault name;
networking.useDHCP = false; networking.useDHCP = false;
imports = [ ./container-login.nix ];
}; };
in [ extraConfig config.config ]; in [ extraConfig config.config ];
prefix = [ "containers" name ]; prefix = [ "containers" name ];

1
nixos/modules/virtualisation/nixos-container.pl
View file

@ -116,7 +116,6 @@ with pkgs.lib;
security.initialRootPassword = mkDefault "!"; security.initialRootPassword = mkDefault "!";
networking.hostName = mkDefault "$containerName"; networking.hostName = mkDefault "$containerName";
networking.useDHCP = false; networking.useDHCP = false;
imports = [ <nixpkgs/nixos/modules/virtualisation/container-login.nix> ];
$extraConfig $extraConfig
} }
EOF EOF