diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-09-25 09:34:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 09:34:17 +0000 |
| commit | 66967ec7521d065f605795d64ddbbbd4fcd448c3 (patch) | |
| tree | c99735a34270f1ca9da366eafcc5b5fce16c7f7f /nixos/modules/virtualisation | |
| parent | fb6595eafdb90ef0bc7a31c2bfc9204e4cad11d9 (diff) | |
| parent | db9b5f5525225acf20f0f030e95532d192b3baac (diff) | |
| download | nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.gz nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.bz2 nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.lz nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.xz nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.tar.zst nixlib-66967ec7521d065f605795d64ddbbbd4fcd448c3.zip | |
Merge pull request #67232 from ck3d/container-useHostResolvConf
machinectl compliant NixOS installation
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/container-config.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index 604fb8a75932..ca7f126c59f6 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -10,7 +10,7 @@ with lib; services.udisks2.enable = mkDefault false; powerManagement.enable = mkDefault false; - networking.useHostResolvConf = mkDefault true; + networking.useHostResolvConf = mkDefault (!config.services.resolved.enable); # Containers should be light-weight, so start sshd on demand. services.openssh.startWhenNeeded = mkDefault true; |