From b5b97f0992eb5876004d8d6506125cb9b4791ca9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 13 Oct 2026 02:42:32 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=8B=20Sync=202026-10-13=2002:42:32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my-default-settings/Makefile | 2 +- my-default-settings/files/etc/uci-defaults/99-default-settings | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/my-default-settings/Makefile b/my-default-settings/Makefile index 23e3c1e53..1bf477431 100644 --- a/my-default-settings/Makefile +++ b/my-default-settings/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=my-default-settings PKG_VERSION:=2 -PKG_RELEASE:=36 +PKG_RELEASE:=37 include $(INCLUDE_DIR)/package.mk diff --git a/my-default-settings/files/etc/uci-defaults/99-default-settings b/my-default-settings/files/etc/uci-defaults/99-default-settings index f87dc90b1..97d23a7f4 100644 --- a/my-default-settings/files/etc/uci-defaults/99-default-settings +++ b/my-default-settings/files/etc/uci-defaults/99-default-settings @@ -8,8 +8,7 @@ sed -i -e '/profile.d/d' /lib/upgrade/keep.d/base-files \ -e 's/git-.*-\(.*\)/git-\1/g' /usr/lib/lua/luci/version.lua 2>/dev/null # 2. 版本与环境参数提取 -version=$(uci -q get system.@status[0].version) -case "$version" in ''|*[!0-9]*) version=0 ;; esac +version=$(uci -q get system.@status[0].version || uci -q get base_config.@status[0].version || echo '0') for ip in $(uci -q get network.lan.ipaddr); do case "$ip" in *.*) lan_ip="${ip%%/*}"; break ;; esac