sync (#406)

suyuan168 · Jan 15, 2024 · a307fa8 · a307fa8
2 parents b8e2618 + f10191f
commit a307fa8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
@@ -271,7 +271,7 @@ while true; do
 	}
 
 	if [ -n "$OMR_TRACKER_DEVICE" ] && [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then
-		if [ -n "$(ip link show $OMR_TRACKER_DEVICE | grep UP)" ]; then
+		if [ -n "$(ip link show $OMR_TRACKER_DEVICE | grep 'state UP')" ]; then
 			# retrieve iface ip and gateway
 			if ([ "$OMR_TRACKER_FAMILY" = "ipv4" ] || [ "$OMR_TRACKER_FAMILY" = "ipv4ipv6" ]) && [ "$OMR_TRACKER_INTERFACE_PROTO" != "dhcpv6" ]; then
 				OMR_TRACKER_DEVICE_IP=$(ip -4 -br addr ls dev "$OMR_TRACKER_DEVICE" | awk -F'[ /]+' '{print $3}')

diff --git a/shadowsocks-libev/files/shadowsocks-libev.init-nft b/shadowsocks-libev/files/shadowsocks-libev.init-nft
@@ -15,7 +15,7 @@ ss_confdir=/var/etc/shadowsocks-libev
 ss_bindir=/usr/bin
 
 ssrules_uc="/usr/share/ss-rules/ss-rules.uc"
-ssrules_nft="/etc/nftables.d/90-ss-rules.nft"
+ssrules_nft="/etc/nftables.d/90-proxy-rules.nft"
 
 ss_mkjson_server_conf() {
 	local cfgserver

diff --git a/shadowsocks-rust/files/shadowsocks-rust.init-nft b/shadowsocks-rust/files/shadowsocks-rust.init-nft
@@ -15,7 +15,7 @@ ss_confdir=/var/etc/shadowsocks-rust
 ss_bindir=/usr/bin
 
 ssrules_uc="/usr/share/ssr-rules/ss-rules.uc"
-ssrules_nft="/etc/nftables.d/90-ssr-rules.nft"
+ssrules_nft="/etc/nftables.d/90-proxy-rules.nft"
 
 ss_mkjson_server_conf() {
 	local cfgserver

diff --git a/v2ray-core/files/etc/init.d/v2ray-nft b/v2ray-core/files/etc/init.d/v2ray-nft
@@ -13,7 +13,7 @@ NAME=v2ray
 CONFIG_FOLDER=/var/etc/$NAME
 
 v2rrules_uc="/usr/share/v2ray-rules/v2r-rules.uc"
-v2rrules_nft="/etc/nftables.d/90-v2r-rules.nft"
+v2rrules_nft="/etc/nftables.d/90-proxy-rules.nft"
 
 FILE_V2RAY_DNSMASQ=/tmp/dnsmasq.d/$NAME
 FILE_V2RAY_DNSMASQ_CACHE=/tmp/$NAME.dnsmasq.cache

diff --git a/xray-core/files/etc/init.d/xray-nft b/xray-core/files/etc/init.d/xray-nft
@@ -13,7 +13,7 @@ NAME=xray
 CONFIG_FOLDER=/var/etc/$NAME
 
 xrrules_uc="/usr/share/xray-rules/xr-rules.uc"
-xrrules_nft="/etc/nftables.d/90-xr-rules.nft"
+xrrules_nft="/etc/nftables.d/90-proxy-rules.nft"
 
 FILE_XRAY_DNSMASQ=/tmp/dnsmasq.d/$NAME
 FILE_XRAY_DNSMASQ_CACHE=/tmp/$NAME.dnsmasq.cache