mwan3: close flock fd when starting mwan3.user scripts

Fixes deadlock with multiple init script calls

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 619629ce85991fbb5aa8677ea076ab2de1043ba4)

diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
index 99c01712d633c2d98f25ead747d5c94da17da95f..80c5d99164df8cb1715a25e928df046d286d65c1 100644 (file)
--- a/net/mwan3/Makefile
+++ b/net/mwan3/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
 PKG_VERSION:=2.11.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>, \
                Aaron Goodman <aaronjg@alumni.stanford.edu>
 PKG_LICENSE:=GPL-2.0

diff --git a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user
index 0960a2628784b597a1e2eefc5157eb3d5fa44adb..fa7315fa5eca2845a52d77a0185f0e87b62fd2ca 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user
+++ b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user
@@ -20,7 +20,7 @@
        }
 
        [ -x /etc/mwan3.user ] || chmod 755 /etc/mwan3.user
-       env -i ACTION="$ACTION" INTERFACE="$INTERFACE" DEVICE="$DEVICE" /etc/mwan3.user
+       env -i ACTION="$ACTION" INTERFACE="$INTERFACE" DEVICE="$DEVICE" /etc/mwan3.user 1000>&-
 }
 
 exit 0