From 3db27f27b2aa9d7d6e3e029a263922a84f141c72 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Fri, 30 Sep 2016 10:06:12 +0300 Subject: [PATCH] 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 --- miniupnpd/Makefile | 2 +- miniupnpd/files/miniupnpd.hotplug | 8 +++----- miniupnpd/files/miniupnpd.init | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile index 97f0b6c..9a33bbe 100644 --- 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 65bc500..320437e 100644 --- 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 79def5d..c7dc6a2 100644 --- 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 -- 2.30.2