From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 10 Apr 2009 14:57:41 +0000 (+0000)
Subject: merge r12960 to 8.09 (closes: #4756), bump release number
X-Git-Tag: 8.09.1~115
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e75c7239fe7d8658d6d085e395c25c993250550b;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r12960 to 8.09 (closes: #4756), bump release number

SVN-Revision: 15207
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 6051db9d71..3ab27c2bb8 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.46
-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 4fddc47232..7d32be077e 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -52,6 +52,7 @@ dnsmasq() {
 	append_bool "$cfg" dbus "-1"
 	append_bool "$cfg" boguspriv "-b"
 	append_bool "$cfg" expandhosts "-E"
+	append_bool "$cfg" enable_tftp "--enable-tftp"
 
 	append_parm "$cfg" dnsforwardmax "-0"
 	append_parm "$cfg" port "-p"
@@ -63,6 +64,8 @@ dnsmasq() {
 	append_parm "$cfg" "local" "-S"
 	append_parm "$cfg" "leasefile" "-l"
 	append_parm "$cfg" "resolvfile" "-r"
+	append_parm "$cfg" "tftp_root" "--tftp-root"
+	append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
 
 	config_get leasefile $cfg leasefile
 	[ -e "$leasefile" ] || touch "$leasefile"