From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 18 Feb 2009 22:00:36 +0000 (+0000)
Subject: [package] make "name" parameter optional in dnsmasq "boot" config sections
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=64b2ab7e6287b26350b89c9ee160d461a983ce39

[package] make "name" parameter optional in dnsmasq "boot" config sections


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14557 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 06bcbfcce..3599fa09a 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 6cb0e0f4f..870414900 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"
 }