feat:稳定性升级

1995chen · May 25, 2024 · be94e5c · be94e5c
1 parent 3d3d9fc
commit be94e5c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/build/dnf_data/netbird/start_netbird.sh b/build/dnf_data/netbird/start_netbird.sh
@@ -13,7 +13,24 @@ if [ -z "$PUBLIC_IP" ] && [ -n "$NB_SETUP_KEY" ] && [ -n "$NB_MANAGEMENT_URL" ];
   sed -i "s#NB_MANAGEMENT_URL#$NB_MANAGEMENT_URL#g" /etc/init.d/netbird
   echo "starting netbird service[$NB_MANAGEMENT_URL] use setup_key: $NB_SETUP_KEY"
   # 启动netbird服务
-  service netbird restart || true
+  service netbird stop || true
+  service netbird start || true
+  # 等待netbird启动
+  while true;
+  do
+    nb_status=$(service netbird status 2>/dev/null || true)
+    ddns_ip=$(/data/monitor_ip/get_ddns_ip.sh 2>/dev/null || true)
+    if [ "$nb_status" != "Running" ] ; then
+      echo "netbird service status is $nb_status, restart and sleep"
+      service netbird stop || true
+      service netbird start || true
+    else
+      echo "netbird service start success, break"
+      break
+    fi
+    # 等待
+    sleep 5
+  done
   sleep 5
   NB_FOREGROUND_MODE=false netbird up
 else

diff --git a/plugin/dp2/README.md b/plugin/dp2/README.md
@@ -6,6 +6,7 @@ dp2.9.0+frida_240418
 ## 如何使用
 将本目录下的dp2.tgz复制到/data/data/dp目录下,然后手动解压dp2.tgz。
 解压后目录结构如下:
+请务必删除原有的libhook.so文件！！！！！！！
 ```shell
 dp
 ├── df_game_r.js