diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2018-06-11 11:17:52 +0200 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-06-11 11:41:26 +0200 |
| commit | 8d60f6ee407373349173fac08985baefe83b5f5c (patch) | |
| tree | f9bf103b6f0abac5d45ca3c0ca0450b8d1c105cb /package/network/services/dnsmasq/files/dnsmasq.init | |
| parent | 83483ba787e5c972099da1e983e95f396961c7f2 (diff) | |
| download | upstream-8d60f6ee407373349173fac08985baefe83b5f5c.tar.gz upstream-8d60f6ee407373349173fac08985baefe83b5f5c.tar.bz2 upstream-8d60f6ee407373349173fac08985baefe83b5f5c.zip | |
dnsmasq: fix confdir option processing (FS#1572)
Fix condir option processing allowing to use the format
"<directory>[,<file-extension>......]," as documented on the dnsmasq man
page which previously resulted into bogus dir being created.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/network/services/dnsmasq/files/dnsmasq.init')
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.init | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 2c71a777c3..4906df9ce4 100644 --- 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 |