From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 18 Jul 2010 00:36:53 +0000 (+0000)
Subject: [backfire] merge r22251
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=96dad49813b42a7fb7e1bb2bdd63f7faafe9235e

[backfire] merge r22251

dnsmasq: initscript: fix bool options handling, bump release number



SVN-Revision: 22269
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 852b126fcc..977e109709 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:=2
+PKG_RELEASE:=3
 
 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 4e0bbf9218..2325a3e4ff 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -23,8 +23,8 @@ append_bool() {
 	local option="$2"
 	local value="$3"
 	local _loctmp
-	config_get_bool _loctmp "$section" "$option"
-	[ "$_loctmp" -gt 0 ] && append args "$value"
+	config_get_bool _loctmp "$section" "$option" 0
+	[ $_loctmp -gt 0 ] && append args "$value"
 }
 
 append_parm() {
@@ -274,7 +274,7 @@ 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 ] || {
+	[ $force -gt 0 ] || {
 		udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0
 	}