From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 23 Nov 2009 00:35:38 +0000 (+0000)
Subject: [package] do not ignore enabled option in init script, bump release number (#6072)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=eacbd83ccd3a3a1f490801932c76522248723b72;hp=79b6c5d5b286c28132cfb7e8e1efc1a2453391c9

[package] do not ignore enabled option in init script, bump release number (#6072)

SVN-Revision: 18491
---

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 61261c7e72..4302281050 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=1.3
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 PKG_MD5SUM:=b5e70e80dcf45b424b8fe3c966bdc613
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
diff --git a/net/miniupnpd/files/miniupnpd.init b/net/miniupnpd/files/miniupnpd.init
index 5bcf8bc99e..4705fc8fcd 100644
--- a/net/miniupnpd/files/miniupnpd.init
+++ b/net/miniupnpd/files/miniupnpd.init
@@ -3,7 +3,7 @@ START=95
 
 start() {
 	config_load "upnpd"
-	local extiface intiface upload download logging secure
+	local extiface intiface upload download logging secure enabled
 
 	config_get extiface config external_iface
 	config_get intiface config internal_iface
@@ -11,6 +11,7 @@ start() {
 	config_get download config download
 	config_get_bool logging config log_output 0
 	config_get_bool secure config secure_mode 0
+	config_get_bool enabled config enabled 0 
 
 	include /lib/network
 	scan_interfaces
@@ -37,9 +38,9 @@ start() {
 			append args "-S"
 
 		if [ "$logging" = "1" ]; then
-			eval start-stop-daemon -S -x miniupnpd -- $args -d | logger -t miniupnpd &
+			[ "$enabled" -gt 0 ] && eval start-stop-daemon -S -x miniupnpd -- $args -d | logger -t miniupnpd &
 		else
-			eval start-stop-daemon -S -x miniupnpd -- $args 2>/dev/null
+			[ "$enabled" -gt 0 ] && eval start-stop-daemon -S -x miniupnpd -- $args 2>/dev/null
 		fi
 
 		# start firewall