diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-04 13:31:10 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-12-04 13:58:54 +0000 |
| commit | d5facd5df3538f5483e4665775a8ed98f6918ed1 (patch) | |
| tree | 803c37fb1b028f9f12ab46a0d740f4262da138c6 /nixos/modules/config/networking.nix | |
| parent | 7993e8790f45f1548adaed2782e9bb83d1dd9df8 (diff) | |
| download | nixlib-d5facd5df3538f5483e4665775a8ed98f6918ed1.tar nixlib-d5facd5df3538f5483e4665775a8ed98f6918ed1.tar.gz nixlib-d5facd5df3538f5483e4665775a8ed98f6918ed1.tar.bz2 nixlib-d5facd5df3538f5483e4665775a8ed98f6918ed1.tar.lz nixlib-d5facd5df3538f5483e4665775a8ed98f6918ed1.tar.xz nixlib-d5facd5df3538f5483e4665775a8ed98f6918ed1.tar.zst nixlib-d5facd5df3538f5483e4665775a8ed98f6918ed1.zip | |
nixos/networking: support static resolv.conf
Diffstat (limited to 'nixos/modules/config/networking.nix')
| -rw-r--r-- | nixos/modules/config/networking.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 619f36cd5150..4101ef82f3e1 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -290,8 +290,8 @@ in ln -s /run/systemd/resolve/resolv.conf /run/resolvconf/interfaces/systemd ''} - # Make sure resolv.conf is up to date if not managed by systemd - ${optionalString (!config.services.resolved.enable) '' + # Make sure resolv.conf is up to date if not managed manually or by systemd + ${optionalString (!config.environment.etc?"resolv.conf") '' ${pkgs.openresolv}/bin/resolvconf -u ''} ''; |