From 0866d17f4f86b286a92ababad96b217b2d16627b Mon Sep 17 00:00:00 2001
From: Hugo Yuan <429632952@163.com>
Date: Wed, 22 Jul 2020 16:43:42 +0800
Subject: [PATCH] fix dnsmasq resolvfile path (#5159)

---
 package/lean/dnsforwarder/files/etc/init.d/dnsforwarder     | 2 +-
 .../lean/luci-app-flowoffload/root/etc/init.d/flowoffload   | 4 ++--
 package/lean/luci-app-sfe/root/etc/init.d/sfe               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder b/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder
index 4b105ba30..4af897198 100644
--- a/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder
+++ b/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder
@@ -202,7 +202,7 @@ stop()
     local addr=$(uci get dnsforwarder.@arguments[0].addr 2>/dev/null)
     addr=${addr/:/#}
     uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
-    uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto 2>/dev/null
+    uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto 2>/dev/null
     uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
 	uci delete dhcp.@dnsmasq[0].serversfile 2>/dev/null
     uci commit dhcp	
diff --git a/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload b/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload
index e3925f692..97863924a 100755
--- a/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload
+++ b/package/lean/luci-app-flowoffload/root/etc/init.d/flowoffload
@@ -139,14 +139,14 @@ stop_pdnsd() {
 change_dns() {
  	uci delete dhcp.@dnsmasq[0].server >/dev/null 2>&1
 	uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#5333
-	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto
+	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto
 	uci set dhcp.@dnsmasq[0].noresolv=0
 	uci commit dhcp
 }
 
 revert_dns() {
 	uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#5333 >/dev/null 2>&1
-	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto
+	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto
 	uci set dhcp.@dnsmasq[0].noresolv=0
 	uci commit dhcp
 }
diff --git a/package/lean/luci-app-sfe/root/etc/init.d/sfe b/package/lean/luci-app-sfe/root/etc/init.d/sfe
index f00256dd7..6920e79b0 100755
--- a/package/lean/luci-app-sfe/root/etc/init.d/sfe
+++ b/package/lean/luci-app-sfe/root/etc/init.d/sfe
@@ -133,14 +133,14 @@ EOF
 change_dns() {
  	uci delete dhcp.@dnsmasq[0].server >/dev/null 2>&1
 	uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#5333
-	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto
+	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto
 	uci set dhcp.@dnsmasq[0].noresolv=0
 	uci commit dhcp
 }
 
 revert_dns() {
 	uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#5333 >/dev/null 2>&1
-	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto
+	uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto
 	uci set dhcp.@dnsmasq[0].noresolv=0
 	uci commit dhcp
 }
@@ -203,4 +203,4 @@ restart(){
 	  stop
 	  start
 	  /etc/init.d/dnsmasq restart && echo "DNSMASQ restart"
-}
\ No newline at end of file
+}