From 15f643fb496b3fb26af9a62d9f1bdd3176868923 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Aug 2022 20:22:33 +0800 Subject: [PATCH] update 2022-08-09 20:22:33 --- luci-app-ipsec-server/root/etc/init.d/luci-app-ipsec-server | 2 +- luci-app-kodexplorer/luasrc/controller/kodexplorer.lua | 4 ++-- luci-app-nginx-pingos/luasrc/controller/pingos.lua | 2 +- luci-app-socat/luasrc/controller/socat.lua | 2 +- luci-app-socat/root/etc/init.d/luci_socat | 2 +- .../luasrc/controller/ssr_mudb_server.lua | 2 +- luci-app-ssr-mudb-server/root/etc/init.d/ssr_mudb_server | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/luci-app-ipsec-server/root/etc/init.d/luci-app-ipsec-server b/luci-app-ipsec-server/root/etc/init.d/luci-app-ipsec-server index 9371763e2..05a7fa70b 100755 --- a/luci-app-ipsec-server/root/etc/init.d/luci-app-ipsec-server +++ b/luci-app-ipsec-server/root/etc/init.d/luci-app-ipsec-server @@ -241,7 +241,7 @@ stop() { sed -i '/l2tp-server/d' ${CHAP_SECRETS} 2>/dev/null top -bn1 | grep "${L2TP_PATH}" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 rm -rf ${L2TP_PATH} - ps -w | grep "/usr/lib/ipsec" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 + busybox ps -w | grep "/usr/lib/ipsec" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 ipt_rule del rm -rf /var/etc/ipsecvpn.include ln -s "libipsec.so.0.0.0" "/usr/lib/ipsec/libipsec.so.0" >/dev/null 2>&1 diff --git a/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua b/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua index 10a0e3bee..9f430b118 100644 --- a/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua +++ b/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua @@ -25,8 +25,8 @@ end function act_status() local e = {} - e.nginx_status = luci.sys.call("ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == 0 - e.php_status = luci.sys.call("ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == 0 + e.nginx_status = luci.sys.call("busybox ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == 0 + e.php_status = luci.sys.call("busybox ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == 0 http_write_json(e) end diff --git a/luci-app-nginx-pingos/luasrc/controller/pingos.lua b/luci-app-nginx-pingos/luasrc/controller/pingos.lua index 7c7bc9972..d0f959b14 100644 --- a/luci-app-nginx-pingos/luasrc/controller/pingos.lua +++ b/luci-app-nginx-pingos/luasrc/controller/pingos.lua @@ -11,7 +11,7 @@ end function act_status() local e = {} - e.status = luci.sys.call("ps -w | grep pingos | grep nginx | grep -v grep > /dev/null") == 0 + e.status = luci.sys.call("busybox ps -w | grep pingos | grep nginx | grep -v grep > /dev/null") == 0 luci.http.prepare_content("application/json") luci.http.write_json(e) end diff --git a/luci-app-socat/luasrc/controller/socat.lua b/luci-app-socat/luasrc/controller/socat.lua index 7a14702d8..db4482bc1 100644 --- a/luci-app-socat/luasrc/controller/socat.lua +++ b/luci-app-socat/luasrc/controller/socat.lua @@ -15,7 +15,7 @@ end function act_status() local e = {} e.index = luci.http.formvalue("index") - e.status = luci.sys.call(string.format("ps -w | grep -v 'grep' | grep '/var/etc/socat/%s' >/dev/null", luci.http.formvalue("id"))) == 0 + e.status = luci.sys.call(string.format("busybox ps -w | grep -v 'grep' | grep '/var/etc/socat/%s' >/dev/null", luci.http.formvalue("id"))) == 0 luci.http.prepare_content("application/json") luci.http.write_json(e) end diff --git a/luci-app-socat/root/etc/init.d/luci_socat b/luci-app-socat/root/etc/init.d/luci_socat index 1dcbc04ce..9c582f8f2 100755 --- a/luci-app-socat/root/etc/init.d/luci_socat +++ b/luci-app-socat/root/etc/init.d/luci_socat @@ -91,7 +91,7 @@ run_service() { } stop_service() { - ps -w | grep "$CONFIG_PATH/" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + busybox ps -w | grep "$CONFIG_PATH/" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & del_rule rm -rf $CONFIG_PATH /var/etc/$CONFIG.include } diff --git a/luci-app-ssr-mudb-server/luasrc/controller/ssr_mudb_server.lua b/luci-app-ssr-mudb-server/luasrc/controller/ssr_mudb_server.lua index 3acadf415..fc2ebcda3 100644 --- a/luci-app-ssr-mudb-server/luasrc/controller/ssr_mudb_server.lua +++ b/luci-app-ssr-mudb-server/luasrc/controller/ssr_mudb_server.lua @@ -39,7 +39,7 @@ end function status() local e = {} - e.status = luci.sys.call("ps -w | grep -v grep | grep '/usr/share/ssr_mudb_server/server.py' >/dev/null") == 0 + e.status = luci.sys.call("busybox ps -w | grep -v grep | grep '/usr/share/ssr_mudb_server/server.py' >/dev/null") == 0 http_write_json(e) end diff --git a/luci-app-ssr-mudb-server/root/etc/init.d/ssr_mudb_server b/luci-app-ssr-mudb-server/root/etc/init.d/ssr_mudb_server index 70a580143..6e00e7a71 100755 --- a/luci-app-ssr-mudb-server/root/etc/init.d/ssr_mudb_server +++ b/luci-app-ssr-mudb-server/root/etc/init.d/ssr_mudb_server @@ -77,7 +77,7 @@ start_ssr_python_server() { } stop_ssr_python_server() { - ps -w | grep "$ssr_path/server.py" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & + busybox ps -w | grep "$ssr_path/server.py" | grep -v "grep" | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 & set_ssr_python_crontab 0 del_rule rm -rf /var/log/$CONFIG.log /var/etc/$CONFIG.include