298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-06-16 12:35:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix firewall deadlock when enable ssr pro

Browse Source
This commit is contained in:
coolsnowwolf 2018-04-25 23:06:41 +08:00
parent edfae5a0d1
commit c5073af680
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/system/procd/Makefile
View File

@ -17,7 +17,7 @@ PKG_SOURCE_VERSION:=dfb68f8556df63878add145ad9c656381bc20656
PKG_MIRROR_HASH:=8d2c70fb0264a6548e39acc5ab1c44cec50fc550c4f931760b0796f8893c9b7f PKG_MIRROR_HASH:=8d2c70fb0264a6548e39acc5ab1c44cec50fc550c4f931760b0796f8893c9b7f
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:= PKG_LICENSE_FILES:=
PKG_MAINTAINER:=John Crispin <john@phrozen.org> PKG_MAINTAINER:=John Crispin <john@phrozen.org>

10
package/system/procd/files/procd.sh
View File

@ -42,14 +42,6 @@ procd_lock() {
local basescript=$(readlink "$initscript") local basescript=$(readlink "$initscript")
local service_name="$(basename ${basescript:-$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() { _procd_call() {
@ -61,7 +53,7 @@ _procd_call() {
} }
_procd_wrapper() { _procd_wrapper() {
# procd_lock procd_lock
while [ -n "$1" ]; do while [ -n "$1" ]; do
eval "$1() { _procd_call _$1 \"\$@\"; }" eval "$1() { _procd_call _$1 \"\$@\"; }"
shift shift