daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init-script: fix openwrt init-script issue.

Browse Source
This commit is contained in:
Nick Peng
2020-03-22 17:11:33 +08:00
parent a6fe329105
commit 29e4d4b48b
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/openwrt/files/etc/init.d/smartdns
View File

@@ -46,7 +46,6 @@ set_forward_dnsmasq()
[ "$server" = "$addr" ] && continue [ "$server" = "$addr" ] && continue
uci add_list dhcp.@dnsmasq[0].server="$server" uci add_list dhcp.@dnsmasq[0].server="$server"
done done
uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
uci set dhcp.@dnsmasq[0].noresolv=1 uci set dhcp.@dnsmasq[0].noresolv=1
uci commit dhcp uci commit dhcp
/etc/init.d/dnsmasq restart /etc/init.d/dnsmasq restart
@@ -57,14 +56,13 @@ stop_forward_dnsmasq()
local OLD_PORT="$1" local OLD_PORT="$1"
addr="127.0.0.1#$OLD_PORT" addr="127.0.0.1#$OLD_PORT"
OLD_SERVER="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)" OLD_SERVER="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
if echo "$OLD_SERVER" | grep "^$addr" >/dev/null 2>&1; then if ! echo "$OLD_SERVER" | grep "^$addr" >/dev/null 2>&1; then
return return
fi fi
uci del_list dhcp.@dnsmasq[0].server="$addr" 2>/dev/null uci del_list dhcp.@dnsmasq[0].server="$addr" 2>/dev/null
addrlist="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)" addrlist="$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)"
[ -z "$addrlist" ] && { [ -z "$addrlist" ] && {
uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto 2>/dev/null
uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
} }
uci commit dhcp uci commit dhcp
@@ -125,7 +123,6 @@ service_triggers() {
procd_add_reload_trigger smartdns procd_add_reload_trigger smartdns
} }
conf_append() conf_append()
{ {
echo "$1 $2" >> $SMARTDNS_CONF_TMP echo "$1 $2" >> $SMARTDNS_CONF_TMP