diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-11-26 11:19:31 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-11-26 16:29:24 -0800 |
| commit | 1860ee27b0e4aae2cc0ed997e14b0d3289ce498f (patch) | |
| tree | 09c605f6540a30bd074b74ea94760f1736c55f75 /nixos/modules/config/networking.nix | |
| parent | 4f2a041345445dc4727b3d56e7458552517e6cd5 (diff) | |
| download | nixlib-1860ee27b0e4aae2cc0ed997e14b0d3289ce498f.tar nixlib-1860ee27b0e4aae2cc0ed997e14b0d3289ce498f.tar.gz nixlib-1860ee27b0e4aae2cc0ed997e14b0d3289ce498f.tar.bz2 nixlib-1860ee27b0e4aae2cc0ed997e14b0d3289ce498f.tar.lz nixlib-1860ee27b0e4aae2cc0ed997e14b0d3289ce498f.tar.xz nixlib-1860ee27b0e4aae2cc0ed997e14b0d3289ce498f.tar.zst nixlib-1860ee27b0e4aae2cc0ed997e14b0d3289ce498f.zip | |
nixos/networking: Fixes
Diffstat (limited to 'nixos/modules/config/networking.nix')
| -rw-r--r-- | nixos/modules/config/networking.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 711cbb2b70bb..773d0b1f1a7d 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -112,8 +112,10 @@ in ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd ''} - # Make sure resolv.conf is up to date - ${pkgs.openresolv}/bin/resolvconf -u + # Make sure resolv.conf is up to date if not managed by systemd + ${optionalString (!config.services.resolved.enable) '' + ${pkgs.openresolv}/bin/resolvconf -u + ''} ''; }; |