From 517adf6366d9799f25d5f14fd36ca74aca893d31 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 21 Nov 2010 13:54:09 +0000
Subject: [PATCH] [backfire] merge r24051

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24052 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/dnsmasq/Makefile           | 2 +-
 package/dnsmasq/files/dnsmasq.init | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 695d26088..14d3cc4dd 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
 PKG_VERSION:=2.55
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 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 1e91eb2b5..0c2229d88 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -271,7 +271,7 @@ dhcp_add() {
 		DNS_SERVERS="$DNS_SERVERS $dnsserver"
 	}
 
-	append_bool "$cfg" ignore "-2 '$ifname'" && return 0
+	append_bool "$cfg" ignore "-2 $ifname" && return 0
 
 	config_get proto "$net" proto
 	[ static = "$proto" ] || return 0
@@ -283,7 +283,12 @@ dhcp_add() {
 	#check for an already active dhcp server on the interface, unless 'force' is set
 	config_get_bool force "$cfg" force 0
 	[ $force -gt 0 ] || {
-		udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0
+		udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && {
+			logger -t dnsmasq \
+				"found already running DHCP-server on interface '$ifname'" \
+				"refusing to start, use 'option force 1' to override"
+			return 0
+		}
 	}
 
 	config_get start "$cfg" start