aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-12-26 00:23:35 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-12-26 00:23:35 +0000
commit2a83e90ceb3287a9481dbb39b3593049219317ef (patch)
tree2052485eff7c2fcc1c768ab3209d5281ccdd2f16
parent371e7aa5210d6b18e4eb9c7ebc5e2b63690db07a (diff)
downloadupstream-2a83e90ceb3287a9481dbb39b3593049219317ef.tar.gz
upstream-2a83e90ceb3287a9481dbb39b3593049219317ef.tar.bz2
upstream-2a83e90ceb3287a9481dbb39b3593049219317ef.zip
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
-rw-r--r--package/dnsmasq/Makefile2
-rw-r--r--package/dnsmasq/files/dnsmasq.init2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 27f438c738..1441a196b4 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 bc14aa6c41..3532dbd652 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() {