diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-04 16:07:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-04 16:07:21 +0000 |
| commit | 81e5b51a2c1a8730d5a3a986788669bebd4bd298 (patch) | |
| tree | 881222715033e8e1bd22b79392fdd04d4381a6fe /nixos/modules | |
| parent | af75b48b518a0d897693dafefbb3c02eaf3215cc (diff) | |
| parent | d5facd5df3538f5483e4665775a8ed98f6918ed1 (diff) | |
| download | nixlib-81e5b51a2c1a8730d5a3a986788669bebd4bd298.tar nixlib-81e5b51a2c1a8730d5a3a986788669bebd4bd298.tar.gz nixlib-81e5b51a2c1a8730d5a3a986788669bebd4bd298.tar.bz2 nixlib-81e5b51a2c1a8730d5a3a986788669bebd4bd298.tar.lz nixlib-81e5b51a2c1a8730d5a3a986788669bebd4bd298.tar.xz nixlib-81e5b51a2c1a8730d5a3a986788669bebd4bd298.tar.zst nixlib-81e5b51a2c1a8730d5a3a986788669bebd4bd298.zip | |
Merge pull request #32308 from orivej/static-resolv-conf
nixos/networking: support static resolv.conf
Diffstat (limited to 'nixos/modules')
| -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 ''} ''; |