diff options
author | Hans Dedecker <dedeckeh@gmail.com> | 2018-06-11 11:17:52 +0200 |
---|---|---|
committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-06-11 22:30:38 +0200 |
commit | c0763f08a5416ce0424dff64e8c75965cf708db0 (patch) | |
tree | 0ecb4dd6173670c7f771fd2575d75cf8768a84ff /package/network/services/dnsmasq/files | |
parent | e6c17aa21912da9b988b57b75e50228eb7e84115 (diff) | |
download | mtk-20170518-c0763f08a5416ce0424dff64e8c75965cf708db0.zip mtk-20170518-c0763f08a5416ce0424dff64e8c75965cf708db0.tar.gz mtk-20170518-c0763f08a5416ce0424dff64e8c75965cf708db0.tar.bz2 |
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')
-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 2c71a77..4906df9 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 |