diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-28 23:39:01 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-28 23:39:01 -0400 |
| commit | 701cb6b099b2071535409c98cc1ccbacdeeb3247 (patch) | |
| tree | 6cafd5189cc7ce07de9abf0cda0e933c0f5f7351 /nixos/modules/services/networking | |
| parent | f3e9e3dea592d8ab4f6a7b29591749f6ee82abc4 (diff) | |
| parent | 70a4c7b1dfdb238d3729c3f71127538943a43afd (diff) | |
| download | nixlib-701cb6b099b2071535409c98cc1ccbacdeeb3247.tar nixlib-701cb6b099b2071535409c98cc1ccbacdeeb3247.tar.gz nixlib-701cb6b099b2071535409c98cc1ccbacdeeb3247.tar.bz2 nixlib-701cb6b099b2071535409c98cc1ccbacdeeb3247.tar.lz nixlib-701cb6b099b2071535409c98cc1ccbacdeeb3247.tar.xz nixlib-701cb6b099b2071535409c98cc1ccbacdeeb3247.tar.zst nixlib-701cb6b099b2071535409c98cc1ccbacdeeb3247.zip | |
Merge branch 'nixos/containers/fix1' of git://github.com/offlinehacker/nixpkgs
nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
Diffstat (limited to 'nixos/modules/services/networking')
| -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 d4ec96a18f6f..37f607b08151 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 85b6ab1efecf..537fe0848eac 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; }; |