From 6d170db96173df58fde66c8651d8c16073f357d3 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 25 Jul 2020 19:46:23 +0800 Subject: [PATCH] treewide: switch to /tmp/resolv.conf.d/resolv.conf.auto --- package/base-files/files/etc/init.d/boot | 5 +++-- .../luasrc/controller/AdGuardHome.lua | 2 +- .../luasrc/model/cbi/AdGuardHome/manual.lua | 4 ++-- .../root/usr/bin/serverchan/serverchan | 2 +- .../lean/dnsforwarder/files/etc/init.d/dnsforwarder | 12 ++++++------ .../lean/luci-app-turboacc/root/etc/init.d/turboacc | 2 +- .../services/ipset-dns/files/ipset-dns.config | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 09b7f44c79..6911dd1b09 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -31,8 +31,9 @@ boot() { chmod 0700 /tmp/.uci touch /var/log/wtmp touch /var/log/lastlog - touch /tmp/resolv.conf.auto - ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf + mkdir -p /tmp/resolv.conf.d + touch /tmp/resolv.conf.d/resolv.conf.auto + ln -sf /tmp/resolv.conf.d/resolv.conf.auto /tmp/resolv.conf.auto grep -q debugfs /proc/filesystems && /bin/mount -o noatime -t debugfs debugfs /sys/kernel/debug [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe diff --git a/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua b/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua index 96da08a953..daba814e6a 100644 --- a/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua +++ b/package/ctcgfw/luci-app-adguardhome/luasrc/controller/AdGuardHome.lua @@ -18,7 +18,7 @@ end function get_template_config() local b local d="" - for cnt in io.lines("/tmp/resolv.conf.auto") do + for cnt in io.lines("/tmp/resolv.conf.d/resolv.conf.auto") do b=string.match (cnt,"^[^#]*nameserver%s+([^%s]+)$") if (b~=nil) then d=d.." - "..b.."\n" diff --git a/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua b/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua index 72a2ebffde..9e2f996b20 100644 --- a/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua +++ b/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/manual.lua @@ -8,7 +8,7 @@ require("table") function gen_template_config() local b local d="" - for cnt in io.lines("/tmp/resolv.conf.auto") do + for cnt in io.lines("/tmp/resolv.conf.d/resolv.conf.auto") do b=string.match (cnt,"^[^#]*nameserver%s+([^%s]+)$") if (b~=nil) then d=d.." - "..b.."\n" @@ -94,4 +94,4 @@ function m.on_commit(map) fs.writefile("/var/run/AdGlucitest","") end end -return m \ No newline at end of file +return m diff --git a/package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan b/package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan index fda34a6fd2..6a38464d73 100755 --- a/package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan +++ b/package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan @@ -470,7 +470,7 @@ function rand_geturl(){ uci delete network.wan.mtu uci commit network uci set dhcp.@dnsmasq[0].port='53' - uci set dhcp.@dnsmasq[0].resolvfile='/tmp/resolv.conf.auto' + uci set dhcp.@dnsmasq[0].resolvfile='/tmp/resolv.conf.d/resolv.conf.auto' uci delete dhcp.@dnsmasq[0].server uci delete dhcp.@dnsmasq[0].noresolv uci commit dhcp diff --git a/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder b/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder index 4b105ba302..2a1d824c9d 100755 --- a/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder +++ b/package/lean/dnsforwarder/files/etc/init.d/dnsforwarder @@ -21,11 +21,11 @@ del_cron() /etc/init.d/cron restart } -fixflowoffload(){ - dns=$(uci get flowoffload.@flow[0].dns 2>/dev/null) +fixturboacc(){ + dns=$(uci get turboacc.config.dns_caching 2>/dev/null) if [ $dns -eq 1 ]; then - uci set flowoffload.@flow[0].dns=0 && uci commit flowoffload - /etc/init.d/flowoffload restart + uci set turboacc.config.dns_caching=0 && uci commit turboacc + /etc/init.d/turboacc restart fi } @@ -170,7 +170,7 @@ start() exit fi makeconfig - fixflowoffload + fixturboacc dnsforwarder -f $DNSFORWARDER_CONF -d sleep 10 mkdir -p ${PID_PATH} @@ -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-turboacc/root/etc/init.d/turboacc b/package/lean/luci-app-turboacc/root/etc/init.d/turboacc index 26904c6867..c205ba9960 100755 --- a/package/lean/luci-app-turboacc/root/etc/init.d/turboacc +++ b/package/lean/luci-app-turboacc/root/etc/init.d/turboacc @@ -201,7 +201,7 @@ change_dns() { revert_dns() { uci del_list dhcp.@dnsmasq[0].server="127.0.0.1#5333" 2>/dev/null - 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/network/services/ipset-dns/files/ipset-dns.config b/package/network/services/ipset-dns/files/ipset-dns.config index 0270366af7..538d3a01a3 100644 --- a/package/network/services/ipset-dns/files/ipset-dns.config +++ b/package/network/services/ipset-dns/files/ipset-dns.config @@ -11,6 +11,6 @@ config ipset-dns #option port '53001' # use given upstream DNS server, - # defaults to first entry in /tmp/resolv.conf.auto + # defaults to first entry in /tmp/resolv.conf.d/resolv.conf.auto #option dns '8.8.8.8'