Merge pull request #144 from Tools-cx-app/Tools-cx-app-patch-2

Adjust ipset loading timing and sync upstream changes

Author: Fanju6

src/module/bin/IPSET-LKM/ko-loader

@@ -0,0 +1,12 @@
+#!/system/bin/sh
+set -e
+
+readonly MODDIR="${0%/*}"
+readonly MODULE_CONF="$MODDIR/config/module.conf"
+readonly LOG_FILE="$MODDIR/logs/service.log"
+
+. "$MODDIR/scripts/utils/common.sh"
+
+log "INFO" "post-fs-data阶段"
+
+sh "$MODDIR/scripts/utils/ipset.sh" load

src/module/post-fs-data.sh

@@ -98,11 +98,12 @@ log_env_info() {
   log "INFO" "=================================="
 }
 
+log "INFO" "service阶段"
+
 # 主流程
 log "INFO" "========== NetProxy 服务启动 =========="
 log_env_info
 load_module_config
-sh "$MODDIR/scripts/utils/ipset.sh" load
 
 wait_for_boot