dnsmasq: fix confdir option processing (FS#1572)

[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..4906df9ce432781b930a735cd3ad4cad7748c0a8 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