🛸 Sync 2026-10-12 19:55:25

my-default-settings/Makefile

@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=my-default-settings
 PKG_VERSION:=2
-PKG_RELEASE:=34
+PKG_RELEASE:=35
 
 include $(INCLUDE_DIR)/package.mk
 

my-default-settings/files/etc/config/base_config

@@ -1,3 +0,0 @@
-config status
-	option version '0'
-	option base '1'

my-default-settings/files/etc/hotplug.d/ieee80211/10-wifi-detect

@@ -2,5 +2,5 @@
 
 [ "${ACTION}" = "add" ] && {
 	/sbin/wifi config
-	[[ -z "$(uci -q get base_config.@status[0].wifi)" ]] && . /sbin/mywifi &
+	[[ -z "$(uci -q get system.@status[0].wifi)" ]] && . /sbin/mywifi &
 }

my-default-settings/files/etc/uci-defaults/99-default-settings

@@ -8,7 +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 base_config.@status[0].version)
+version=$(uci -q get system.@status[0].version)
 case "$version" in ''|*[!0-9]*) version=0 ;; esac
 
 for ip in $(uci -q get network.lan.ipaddr); do
@@ -133,9 +133,9 @@ modprobe xt_FULLCONENAT >/dev/null 2>&1 || modprobe nft_fullcone >/dev/null 2>&1
 }
 
 # 7. 更新版本状态、一次性提交所有 UCI 配置并安全退出
-[ -f /etc/config/base_config ] && {
-	uci -q get base_config.@status[0] >/dev/null || uci -q add base_config status >/dev/null
-	uci -q set base_config.@status[0].version="$version"
+[ -f /etc/config/system ] && {
+	uci -q get system.@status[0] >/dev/null || uci -q add system status >/dev/null
+	uci -q set system.@status[0].version="$version"
 }
 
 uci -q commit

my-default-settings/files/sbin/mywifi

@@ -56,7 +56,7 @@ done
 # -------------------------------------------------------------
 # 既未强制重新配置，又无自定义参数，且已配置过时直接跳过
 if [ $FORCE -eq 0 ] && [ -z "$CUSTOM_SSID" ] && [ $HAS_PASSWD -eq 0 ]; then
-    if [ "$(uci -q get base_config.@status[0].wifi 2>/dev/null)" = "1" ]; then
+    if [ "$(uci -q get system.@status[0].wifi 2>/dev/null)" = "1" ]; then
         log_info "WiFi 已配置完成，无需重复执行。"
         exit 0
     fi
@@ -226,10 +226,9 @@ done
 # -------------------------------------------------------------
 uci commit wireless 2>/dev/null
 
-if uci -q get base_config.@status[0] >/dev/null 2>&1; then
-    uci -q set base_config.@status[0].wifi=1
-    uci commit base_config 2>/dev/null
-fi
+uci -q get system.@status[0] >/dev/null || uci -q add system status >/dev/null
+uci -q set system.@status[0].wifi=1
+uci commit system 2>/dev/null
 
 wifi reload 2>/dev/null || /sbin/wifi reload 2>/dev/null