update 2026-09-28 18:25:11

luci-app-passwall/root/etc/init.d/passwall

@@ -6,11 +6,10 @@ STOP=15
 ROOT="${IPKG_INSTROOT:-}"
 . "$ROOT/usr/share/passwall/utils.sh"
 APP_FILE=${APP_PATH}/app.sh
-LOCK_FILE_DIR=/var/lock
-LOCK_FILE=${LOCK_FILE_DIR}/${CONFIG}.lock
+LOCK_FILE=${LOCK_PATH}/${CONFIG}.lock
 
 set_lock() {
-	[ ! -d "$LOCK_FILE_DIR" ] && mkdir -p $LOCK_FILE_DIR
+	[ ! -d "$LOCK_PATH" ] && mkdir -p $LOCK_PATH
 	exec 999>"$LOCK_FILE"
 	flock -xn 999
 }
@@ -34,13 +33,16 @@ unlock() {
 }
 
 boot_func() {
+	rm -f ${LOCK_PATH}/${CONFIG}_ready.lock
+	rm -f ${LOCK_PATH}/${CONFIG}_rule_update.lock
+	rm -f ${LOCK_PATH}/${CONFIG}_subscribe.lock
 	local delay=$(uci -q get ${CONFIG}.@global_delay[0].start_delay || echo 1)
 	if [ "$delay" -gt 0 ]; then
 		echolog "执行启动延时 $delay 秒后再启动!"
 		sleep $delay
 	fi
 	restart boot
-	touch ${LOCK_FILE_DIR}/${CONFIG}_ready.lock
+	touch ${LOCK_PATH}/${CONFIG}_ready.lock
 }
 
 boot() {
@@ -50,7 +52,7 @@ boot() {
 start() {
 	set_lock
 	[ $? == 1 ] && echolog "脚本已经在运行，不重复运行，退出." && exit 0
-	$APP_FILE start
+	$APP_FILE start $2
 	unset_lock
 }
 
@@ -58,15 +60,17 @@ stop() {
 	unlock
 	set_lock
 	[ $? == 1 ] && echolog "停止脚本等待超时，不重复运行，退出." && exit 0
-	$APP_FILE stop
+	$APP_FILE stop $2
 	unset_lock
 }
 
 restart() {
+	local action=${2:-$1}
+	[ "$action" = "restart" ] && action=
 	set_lock
 	[ $? == 1 ] && echolog "脚本已经在运行，不重复运行，退出." && exit 0
-	rule_lock=${LOCK_FILE_DIR}/${CONFIG}_rule_update.lock
-	sub_lock=${LOCK_FILE_DIR}/${CONFIG}_subscribe.lock
+	rule_lock=${LOCK_PATH}/${CONFIG}_rule_update.lock
+	sub_lock=${LOCK_PATH}/${CONFIG}_subscribe.lock
 	for i in $(seq 1 300); do
 		if [ ! -f "$rule_lock" ] && [ ! -f "$sub_lock" ]; then
 			break
@@ -74,8 +78,8 @@ restart() {
 		sleep 2
 	done
 	rm -f "$rule_lock" "$sub_lock"
-	$APP_FILE stop
-	$APP_FILE start $1
+	$APP_FILE stop $action
+	$APP_FILE start $action
 	unset_lock
 }