From 35aa6486f7d060bde51fe6aff928ca747699427d Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Tue, 26 Jun 2018 09:03:27 +0200
Subject: [PATCH] Update dnsmasq.init to latest version in openwrt upstream

---
 .../network/services/dnsmasq/files/dnsmasq.init     | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/root/package/network/services/dnsmasq/files/dnsmasq.init b/root/package/network/services/dnsmasq/files/dnsmasq.init
index 8cbc5d73..6693fdbf 100644
--- a/root/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/root/package/network/services/dnsmasq/files/dnsmasq.init
@@ -946,11 +946,12 @@ dnsmasq_start()
 
 	xappend "--dhcp-broadcast=tag:needs-broadcast"
 
-	xappend "--hostsdir=$(dirname $HOSTFILE)"
+	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
@@ -1068,18 +1069,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() {