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

fix restart dnsmasq issue

Browse Source
This commit is contained in:
Nick Peng
2019-07-19 20:55:44 +08:00
parent 46742fc1d7
commit 9b8d7de6d3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/optware/S50smartdns
View File

@@ -52,22 +52,22 @@ clear_iptable()
get_dnsmasq_cmd() get_dnsmasq_cmd()
{ {
CMD="`ps | grep -e '[a-zA-Z]* \{1,\}dnsmasq | grep -v grep 2>/dev/null'`" CMD="`ps | grep -e '[a-zA-Z]\{0,2\} \{1,\}dnsmasq' | grep -v grep 2>/dev/null`"
if [ ! -z "$CMD" ]; then if [ ! -z "$CMD" ]; then
return return
fi fi
CMD="`ps | grep "/usr/sbin/dnsmasq" | grep -v grep 2>/dev/null`" CMD="`ps | grep '/usr/sbin/dnsmasq' | grep -v grep 2>/dev/null`"
if [ ! -z "$CMD" ]; then if [ ! -z "$CMD" ]; then
return return
fi fi
CMD="`ps | grep "dnsmasq" | grep -v grep 2>/dev/null`" CMD="`ps | grep 'dnsmasq' | grep -v grep 2>/dev/null`"
if [ ! -z "$CMD" ]; then if [ ! -z "$CMD" ]; then
return return
fi fi
CMD="`ps ax | grep -e '[a-zA-Z]* \{1,\}dnsmasq | grep -v grep 2>/dev/null'`" CMD="`ps ax | grep -e '[a-zA-Z]\{0,2\} \{1,\}dnsmasq' | grep -v grep 2>/dev/null`"
if [ ! -z "$CMD" ]; then if [ ! -z "$CMD" ]; then
return return
fi fi
@@ -77,7 +77,7 @@ get_dnsmasq_cmd()
return return
fi fi
CMD="`ps ax | grep "dnsmasq" | grep -v grep 2>/dev/null`" CMD="`ps ax | grep 'dnsmasq' | grep -v grep 2>/dev/null`"
if [ ! -z "$CMD" ]; then if [ ! -z "$CMD" ]; then
return return
fi fi
@@ -152,8 +152,6 @@ set_dnsmasq_conf()
echo "port=0" >> $CONF_FILE echo "port=0" >> $CONF_FILE
RESTART_DNSMASQ=1 RESTART_DNSMASQ=1
fi fi
RESTART_DNSMASQ=1
} }
set_dnsmasq() set_dnsmasq()