diff options
| author | Christian Kögler <ck3d@gmx.de> | 2019-08-22 07:52:58 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-09-13 17:29:50 +0200 |
| commit | 28853d8954199bc7944797c260d8116a68da2b46 (patch) | |
| tree | d0ca9c2735888a80c8534504f57cf98e53f9e00d /nixos | |
| parent | cca5cb5a0288352208a4b1f46008aa3ccb7aeccd (diff) | |
| download | nixlib-28853d8954199bc7944797c260d8116a68da2b46.tar nixlib-28853d8954199bc7944797c260d8116a68da2b46.tar.gz nixlib-28853d8954199bc7944797c260d8116a68da2b46.tar.bz2 nixlib-28853d8954199bc7944797c260d8116a68da2b46.tar.lz nixlib-28853d8954199bc7944797c260d8116a68da2b46.tar.xz nixlib-28853d8954199bc7944797c260d8116a68da2b46.tar.zst nixlib-28853d8954199bc7944797c260d8116a68da2b46.zip | |
container config: better default in case of resolved
Avoid assertion in nixos/modules/system/boot/resolved.nix if service systemd-resolved is enabled.
Diffstat (limited to 'nixos')
| -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; |