miniupnpd: fix local variables in hotplug, change startup priority

* Remove 'local' variable definitions from hotplug script.
  Busybox 1.25.0 does not allow local variables defined outside functions.
  This fixes #231

* Change startup priority from 95 to 94, so that miniupnpd starts
  before S95done (which is intended to be run last).

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 97f0b6cb86c343257b58bae5be64133d4eab231a..9a33bbebd879c0c3b57c4fb3d7174c14b61fd319 100644 (file)
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=2.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/miniupnpd/files/miniupnpd.hotplug b/miniupnpd/files/miniupnpd.hotplug
index 65bc5006d1d518d8c8575b158474a9d36dbd9ee6..320437e87b82b564dc0c95e0538b3e95c7fe9d73 100644 (file)
--- a/miniupnpd/files/miniupnpd.hotplug
+++ b/miniupnpd/files/miniupnpd.hotplug
@@ -13,11 +13,9 @@
 
 [ ! "$ACTION" = "ifup" ] && service_check /usr/sbin/miniupnpd && exit 0
 
-local iface
-local ifname
-local tmpconf="/var/etc/miniupnpd.conf"
-local extiface=$(uci get upnpd.config.external_iface)
-local extzone=$(uci get upnpd.config.external_zone)
+tmpconf="/var/etc/miniupnpd.conf"
+extiface=$(uci get upnpd.config.external_iface)
+extzone=$(uci get upnpd.config.external_zone)
 
 . /lib/functions/network.sh
 

diff --git a/miniupnpd/files/miniupnpd.init b/miniupnpd/files/miniupnpd.init
index 79def5dc179e9687b20969931bba76f3214095e6..c7dc6a26289991c91b4fd00d33cdb66b60d58f97 100644 (file)
--- a/miniupnpd/files/miniupnpd.init
+++ b/miniupnpd/files/miniupnpd.init
@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006-2014 OpenWrt.org
 
-START=95
+START=94
 STOP=15
 
 SERVICE_USE_PID=1