From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 26 Dec 2009 00:23:35 +0000 (+0000)
Subject: dnsmasq: While trying to document the dhcp UCI config, I noticed that the name config... 
X-Git-Tag: reboot~21575
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2a83e90ceb3287a9481dbb39b3593049219317ef;p=openwrt%2Fstaging%2Fblogic.git

dnsmasq: While trying to document the dhcp UCI config, I noticed that the name config option is applied wrongly when adding static addresses. Cf. the dnsmasq man page. Signed-off-by: Stefan Bethke <stb@lassitu.de>

SVN-Revision: 18934
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 27f438c73857..1441a196b49e 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.51
-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 bc14aa6c4147..3532dbd652c5 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -180,7 +180,7 @@ dhcp_host_add() {
 	config_get ip "$cfg" ip
 	[ -n "$ip" ] || return 0
 
-	append args "--dhcp-host=$mac,$ip${name:+,$name}"
+	append args "--dhcp-host=$mac,${name:+net:$name,}$ip"
 }
 
 dhcp_mac_add() {