aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-02-18 22:00:36 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-02-18 22:00:36 +0000
commit19056e2b79a4b3dd2d7c2c00c53db047257d5d45 (patch)
tree65e8fa15555d62ab0f5aa8136f74ae278970ac00
parent388b05cabff4b12cd6b84934579051a0ffd82700 (diff)
downloadupstream-19056e2b79a4b3dd2d7c2c00c53db047257d5d45.tar.gz
upstream-19056e2b79a4b3dd2d7c2c00c53db047257d5d45.tar.bz2
upstream-19056e2b79a4b3dd2d7c2c00c53db047257d5d45.zip
[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
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dnsmasq/files/dnsmasq.init3
2 files changed, 2 insertions, 3 deletions
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"
}