🌴 Sync 2026-04-20 08:30:53

luci-app-passwall2/root/etc/hotplug.d/iface/98-passwall2

@@ -1,11 +1,23 @@
 #!/bin/sh
 
-[[ "$ACTION" == "ifup" && $(uci get "passwall2.@global[0].enabled") == "1" ]] && [ -f /var/lock/passwall2_ready.lock ] && {
-	default_device=$(ip route | grep default | awk -F 'dev ' '{print $2}' | awk '{print $1}')
-	[ "$default_device" == "$DEVICE" ] && {
-		LOCK_FILE_DIR=/var/lock
-		[ ! -d ${LOCK_FILE_DIR} ] && mkdir -p ${LOCK_FILE_DIR}
-		LOCK_FILE="${LOCK_FILE_DIR}/passwall2_ifup.lock"
+[ "$ACTION" = "ifup" ] || [ "$ACTION" = "ifupdate" ] || exit 0
+
+. /usr/share/passwall2/utils.sh
+
+([ "$(get_cache_var "ENABLED_DEFAULT_ACL")" = "1" ] || [ "$(get_cache_var "ENABLED_ACLS")" = "1" ]) && [ -f ${LOCK_PATH}/${CONFIG}_ready.lock ] && {
+
+	default_device=$(ip route show default 2>/dev/null | awk -F 'dev ' '{print $2}' | awk '{print $1}' | head -n1)
+	default6_device=$(ip -6 route show default 2>/dev/null | awk -F 'dev ' '{print $2}' | awk '{print $1}' | head -n1)
+	( [ "$default_device" = "$DEVICE" ] || [ "$default6_device" = "$DEVICE" ] ) && {
+
+		if [ "$ACTION" = "ifupdate" ]; then
+			USE_TABLES=$(get_cache_var "USE_TABLES")
+			[ -n "$USE_TABLES" ] && ${APP_PATH}/${USE_TABLES}.sh update_wan_sets >/dev/null 2>&1 &
+			exit 0
+		fi
+
+		[ ! -d ${LOCK_PATH} ] && mkdir -p ${LOCK_PATH}
+		LOCK_FILE="${LOCK_PATH}/${CONFIG}_ifup.lock"
 		if [ -s ${LOCK_FILE} ]; then
 			SPID=$(cat ${LOCK_FILE})
 			if [ -e /proc/${SPID}/status ]; then
@@ -15,8 +27,8 @@
 		fi
 		echo $$ > ${LOCK_FILE}
 		
-		/etc/init.d/passwall2 restart >/dev/null 2>&1 &
-		logger -p notice -t network -s "passwall2: restart when $INTERFACE ifup"
+		/etc/init.d/${CONFIG} restart >/dev/null 2>&1 &
+		logger -p notice -t network -s "${CONFIG}: restart when $INTERFACE ifup"
 		
 		rm -rf ${LOCK_FILE}
 	}