Merge pull request #67232 from ck3d/container-useHostResolvConf

machinectl compliant NixOS installation
2019-09-25 09:34:17 +00:00
parent fb6595eafd db9b5f5525
commit 66967ec752
7 changed files with 103 additions and 2 deletions
--- 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;