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>
This commit is contained in:
		| @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk | ||||
|  | ||||
| PKG_NAME:=dnsmasq | ||||
| PKG_VERSION:=2.80test2 | ||||
| PKG_RELEASE:=1 | ||||
| PKG_RELEASE:=2 | ||||
|  | ||||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz | ||||
| PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Hans Dedecker
					Hans Dedecker