diff --git a/luci-app-easytier/luci-app-easytier/root/etc/init.d/easytier b/luci-app-easytier/luci-app-easytier/root/etc/init.d/easytier index bc612e8d0..6b95b25a6 100644 --- a/luci-app-easytier/luci-app-easytier/root/etc/init.d/easytier +++ b/luci-app-easytier/luci-app-easytier/root/etc/init.d/easytier @@ -145,8 +145,8 @@ check_config() { proxy_network=$(grep -F '[[proxy_network]]' $config_file) wireguard_port=$(cat $config_file | grep "wireguard_listen = " | awk -F ":" '{print $2}'| tr -d '/", ') log="$(uci -q get easytier.@easytier[0].log || echo off)" - echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 检测配置文件可用性 ${easytierbin} --check-config ${config_file}" >>/tmp/easytier.log - ${easytierbin} --check-config ${config_file} >> /tmp/easytier.log 2>&1 & + echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 检测配置文件可用性 ${easytierbin} --check-config --config-file ${config_file}" >>/tmp/easytier.log + ${easytierbin} --check-config --config-file ${config_file} >> /tmp/easytier.log 2>&1 & echo "$(date '+%Y-%m-%d %H:%M:%S') easytier : 开始运行 ${easytierbin} -c ${config_file}" >>/tmp/easytier.log procd_open_instance @@ -437,11 +437,11 @@ start_et() { ps | grep 'easytier-core' | grep -v grep | awk '{print $1}' | xargs kill >/dev/null 2>&1 ps | grep 'easytier-core' | grep -v grep | awk '{print $1}' | xargs kill -9 >/dev/null 2>&1 + get_etconfig if [ "$etcmd" = "config" ] ; then #配置文件启动方式 check_config else - get_etconfig procd_open_instance "easytier_core" get_tz [ -z "$SET_TZ" ] || procd_set_param env TZ="$SET_TZ" diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 8c4c66f18..0f3c78f91 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=ed2de9add79623e2e5dbc5930ee39cc7037a7c6e0ecd58ba528b6f73d61457b5 endef -GEOSITE_VER:=20260130112058 +GEOSITE_VER:=20260131100437 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=370e27da65492395e65e7beb660745d523dbc1cf122b32276e5ec3c0ad780329 + HASH:=e183d477aa4c149a7c809cc2f31b82e6bb22c492421eb96d38c72f4904b4c31c endef GEOSITE_IRAN_VER:=202601260049