OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpd: make hotplug work again 

hotplug scripts are sourced not exec'd so #!/bin/sh /etc/rc.common
doesn't pull in the functions defined in /etc/rc.common thus since
'enabled' isn't defined the following sequence always fails:

enabled miniupnpd || exit 0

Unfortunately sourcing /etc/rc.common doesn't appear to work so come up
with some alternatives.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant 2020-05-10 13:39:09 +01:00 committed by Kevin Darbyshire-Bryant
parent 83d36065d5
commit b7c59c390f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/miniupnpd/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=miniupnpd PKG_NAME:=miniupnpd
PKG_VERSION:=2.1.20191006 PKG_VERSION:=2.1.20191006
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

12
net/miniupnpd/files/miniupnpd.hotplug
View File

@ -1,15 +1,15 @@
#!/bin/sh /etc/rc.common /etc/init.d/miniupnpd enabled || exit 0
enabled miniupnpd || exit 0
# If miniupnpd is not running: # If miniupnpd is not running:
# - check on _any_ event (even updates may contribute to network_find_wan*) # - check on _any_ event (event updates may contribute to network_find_wan*)
# If miniupnpd _is_ running: # If miniupnpd _is_ running:
# - check only on ifup (otherwise lease updates etc would cause # - check only on ifup (otherwise lease updates etc would cause
# miniupnpd state loss) # miniupnpd state loss)
[ "$ACTION" != "ifup" ] && service_running miniupnpd && exit 0 . /lib/functions/procd.sh
[ "$ACTION" != "ifup" ] && procd_running "miniupnpd" "*" && exit 0
tmpconf="/var/etc/miniupnpd.conf" tmpconf="/var/etc/miniupnpd.conf"
extiface=$(uci get upnpd.config.external_iface) extiface=$(uci get upnpd.config.external_iface)
@ -20,7 +20,7 @@ extzone=$(uci get upnpd.config.external_zone)
[ -z "$extiface" ] && { [ -z "$extiface" ] && {
# manual external zone (if dynamically find interfaces # manual external zone (if dynamically find interfaces
# belonging to it) overrides network_find_wan* # belonging to it) overrides network_find_wan*
[ -n "$extzone" ] && ifname=$(fw3 -q zone "$extzone" | head -1) [ -n "$extzone" ] && ifname=$(fw3 -q zone "$extzone" | head -1)
[ -z "$extiface" ] && network_find_wan extiface [ -z "$extiface" ] && network_find_wan extiface
[ -z "$extiface" ] && network_find_wan6 extiface [ -z "$extiface" ] && network_find_wan6 extiface
} }