diff options
author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-03-20 08:51:08 +0100 |
---|---|---|
committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-03-24 23:59:50 +0100 |
commit | 70a4c7b1dfdb238d3729c3f71127538943a43afd (patch) | |
tree | f2607d1c3a2b8991ab451df9fd6ae9b0a38ce6d2 /nixos | |
parent | a1a167bc8bfd40616d6ad465b5c44337c7fee657 (diff) | |
download | nixpkgs-70a4c7b1dfdb238d3729c3f71127538943a43afd.tar nixpkgs-70a4c7b1dfdb238d3729c3f71127538943a43afd.tar.gz nixpkgs-70a4c7b1dfdb238d3729c3f71127538943a43afd.tar.bz2 nixpkgs-70a4c7b1dfdb238d3729c3f71127538943a43afd.tar.lz nixpkgs-70a4c7b1dfdb238d3729c3f71127538943a43afd.tar.xz nixpkgs-70a4c7b1dfdb238d3729c3f71127538943a43afd.tar.zst nixpkgs-70a4c7b1dfdb238d3729c3f71127538943a43afd.zip |
nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
- Make dhcp work, use dhcpcd without udev in container - Make login shell work, patch getty to not wait for /dev/tty0 - Make ssh work, sshd/pam do not start session
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/networking/dhcpcd.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/ssh/sshd.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index d4ec96a18f6..37f607b0815 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -4,7 +4,7 @@ with pkgs.lib; let - inherit (pkgs) dhcpcd; + dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd_without_udev; # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge. diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 85b6ab1efec..537fe0848ea 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -285,7 +285,7 @@ in networking.firewall.allowedTCPPorts = cfg.ports; security.pam.services.sshd = - { startSession = true; + { startSession = !config.boot.isContainer; showMotd = true; unixAuth = cfg.passwordAuthentication; }; |