From c5073af680335d401155ea51d0caad1b69f2da40 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 25 Apr 2018 23:06:41 +0800 Subject: [PATCH] fix firewall deadlock when enable ssr pro --- package/system/procd/Makefile | 2 +- package/system/procd/files/procd.sh | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 5971e0293..31658af34 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE_VERSION:=dfb68f8556df63878add145ad9c656381bc20656 PKG_MIRROR_HASH:=8d2c70fb0264a6548e39acc5ab1c44cec50fc550c4f931760b0796f8893c9b7f CMAKE_INSTALL:=1 -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:= PKG_MAINTAINER:=John Crispin diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 8cb15f27e..c021fc725 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -42,14 +42,6 @@ procd_lock() { local basescript=$(readlink "$initscript") local service_name="$(basename ${basescript:-$initscript})" - flock -n 1000 &> /dev/null - if [ "$?" != "0" ]; then - exec 1000>"$IPKG_INSTROOT/var/lock/procd_${service_name}.lock" - flock 1000 - if [ "$?" != "0" ]; then - logger "warning: procd flock for $service_name failed" - fi - fi } _procd_call() { @@ -61,7 +53,7 @@ _procd_call() { } _procd_wrapper() { -# procd_lock + procd_lock while [ -n "$1" ]; do eval "$1() { _procd_call _$1 \"\$@\"; }" shift