From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 18 Feb 2009 22:00:36 +0000 (+0000)
Subject: make "name" parameter optional in dnsmasq "boot" config sections
X-Git-Tag: reboot~24455
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cd978f453150d365b20171d53a0d151245e373cc;p=openwrt%2Fstaging%2Fxback.git

make "name" parameter optional in dnsmasq "boot" config sections

SVN-Revision: 14557
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 06bcbfcce0..3599fa09ad 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.47
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 6cb0e0f4fa..870414900f 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -182,7 +182,6 @@ dhcp_boot_add() {
 	local cfg="$1"
 
 	config_get name "$cfg" name
-	[ -n "$name" ] || return 0
 
 	config_get filename "$cfg" filename
 	[ -n "$filename" ] || return 0
@@ -193,7 +192,7 @@ dhcp_boot_add() {
 	config_get serveraddress "$cfg" serveraddress
 	[ -n "$serveraddress" ] || return 0
 
-	append args "--dhcp-boot=net:$name,$filename,$servername,$serveraddress"
+	append args "--dhcp-boot=${name:+net:$name,}$filename,$servername,$serveraddress"
 
 	dhcp_option_add "$cfg" "$name"
 }