dnsmasq: fix dnsmasq startup issue

[openwrt/openwrt.git] / package / network / services / dnsmasq / files / dnsmasq.init

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 2c71a777c33bec788650a666a1da2fb2b6fa1cfb..bb8d07ff354ec5444056b2e645302272ce0fbf8c 100644 (file)
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -941,8 +941,9 @@ dnsmasq_start()
        xappend "--addn-hosts=$(dirname $HOSTFILE)"
 
        config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d"
-       [ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir
        xappend "--conf-dir=$dnsmasqconfdir"
+       dnsmasqconfdir="${dnsmasqconfdir%%,*}"
+       [ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir
        xappend "--user=dnsmasq"
        xappend "--group=dnsmasq"
        echo >> $CONFIGFILE_TMP
@@ -1060,18 +1061,10 @@ service_triggers()
        config_foreach add_interface_trigger dhcp
 }
 
-boot()
-{
-       BOOT=1
-       start "$@"
-}
-
 start_service() {
        local instance="$1"
        local instance_found=0
 
-       [ -n "$BOOT" ] && return
-
        . /lib/functions/network.sh
 
        config_cb() {