|
|
@@ -52,22 +52,22 @@ clear_iptable()
|
|
|
|
|
|
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
|
|
|
return
|
|
|
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
|
|
|
return
|
|
|
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
|
|
|
return
|
|
|
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
|
|
|
return
|
|
|
fi
|
|
|
@@ -77,7 +77,7 @@ get_dnsmasq_cmd()
|
|
|
return
|
|
|
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
|
|
|
return
|
|
|
fi
|
|
|
@@ -152,8 +152,6 @@ set_dnsmasq_conf()
|
|
|
echo "port=0" >> $CONF_FILE
|
|
|
RESTART_DNSMASQ=1
|
|
|
fi
|
|
|
-
|
|
|
- RESTART_DNSMASQ=1
|
|
|
}
|
|
|
|
|
|
set_dnsmasq()
|