Merge pull request #62955 from abbradar/resolvconf

resolvconf service: init
2019-07-17 11:07:12 +03:00
parent 0f5e19cc2b 01b90dce78
commit 294751a4fc
13 changed files with 216 additions and 145 deletions
@@ -103,7 +103,7 @@ let

            script =
              ''
-                ${optionalString (!config.environment.etc?"resolv.conf") ''
+                ${optionalString config.networking.resolvconf.enable ''
                  # Set the static DNS configuration, if given.
                  ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF
                  ${optionalString (cfg.nameservers != [] && cfg.domain != null) ''
@@ -1017,7 +1017,6 @@ in
        pkgs.iproute
        pkgs.iputils
        pkgs.nettools
-        pkgs.openresolv
      ]
      ++ optionals config.networking.wireless.enable [
        pkgs.wirelesstools # FIXME: obsolete?