From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 5 Jun 2012 12:56:42 +0000 (+0000)
Subject: miniupnpd: always (re)start from hotplug handler, make boot() a no-op (#11585)
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=434e21e9990fbe848884b610f6e188ff24944abc;p=openwrt%2Fsvn-archive%2Fpackages.git

miniupnpd: always (re)start from hotplug handler, make boot() a no-op (#11585)

SVN-Revision: 32056
---

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 71f3b781c..dcbc557d7 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=1.6.20110730
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/net/miniupnpd/files/miniupnpd.iface.hotplug b/net/miniupnpd/files/miniupnpd.iface.hotplug
index 32d527257..472b8c2e7 100644
--- a/net/miniupnpd/files/miniupnpd.iface.hotplug
+++ b/net/miniupnpd/files/miniupnpd.iface.hotplug
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-/etc/init.d/miniupnpd enabled && [ -n "`pidof miniupnpd`" ] && [ "$ACTION" = "ifup" ] && {
-	local intif
-	for intif in $(uci_get upnpd config internal_iface); do
-		[ "$INTERFACE" = "$intif" ] && /etc/init.d/miniupnpd restart
+/etc/init.d/miniupnpd enabled && [ "$ACTION" = "ifup" ] && {
+	local iface
+	for iface in $(uci_get upnpd config internal_iface; uci_get upnpd config external_iface); do
+		[ "$INTERFACE" = "$iface" ] && /etc/init.d/miniupnpd restart
 	done
 }