From 971634b26c14c9a741da33783668c0b1eaf45200 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 29 Jul 2024 09:23:35 +0200 Subject: [PATCH] mwan3: close flock fd when starting mwan3.user scripts Fixes deadlock with multiple init script calls Signed-off-by: Florian Eckert (cherry picked from commit 619629ce85991fbb5aa8677ea076ab2de1043ba4) --- net/mwan3/Makefile | 2 +- net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index 99c01712d6..80c5d99164 100644 --- 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 , \ Aaron Goodman 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 0960a26287..fa7315fa5e 100644 --- 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