update 2026-10-02 18:15:02

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

@@ -5,11 +5,10 @@ STOP=15
 
 . $IPKG_INSTROOT/usr/share/passwall2/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
 }
@@ -33,13 +32,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
 		log_i18n 0 "Start after a delay of %s seconds!" "${delay}"
 		sleep $delay
 	fi
 	restart boot
-	touch ${LOCK_FILE_DIR}/${CONFIG}_ready.lock
+	touch ${LOCK_PATH}/${CONFIG}_ready.lock
 }
 
 boot() {
@@ -64,8 +66,8 @@ stop() {
 restart() {
 	set_lock
 	[ $? == 1 ] && log_i18n 0 "The script is already running, do not run it again. Exit." && 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