From: Jiale Liu <admin@licsber.site>
Date: Sun, 14 Apr 2024 16:27:49 +0000 (+0800)
Subject: base-files: fix luci TZ default show zonename
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4a083833399077f54e8ff40a49d688d4c5c9e762;p=openwrt%2Fstaging%2Fnbd.git

base-files: fix luci TZ default show zonename

fix default timezone to correct GMT0,
origin value 'UTC' is zonename, not timezone.

Signed-off-by: Jiale Liu <admin@licsber.site>

Link: https://github.com/openwrt/openwrt/pull/15128
Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index ca40a62cd4..fecf82fcaa 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -312,7 +312,8 @@ generate_static_system() {
 		delete system.@system[0]
 		add system system
 		set system.@system[-1].hostname='OpenWrt'
-		set system.@system[-1].timezone='UTC'
+		set system.@system[-1].timezone='GMT0'
+		set system.@system[-1].zonename='UTC'
 		set system.@system[-1].ttylogin='0'
 		set system.@system[-1].log_size='128'
 		set system.@system[-1].urandom_seed='0'
diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
index dcfc2616c6..cff2d87072 100755
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -9,8 +9,8 @@ validate_system_section() {
 		'hostname:string:OpenWrt' \
 		'conloglevel:uinteger' \
 		'buffersize:uinteger' \
-		'timezone:string:UTC' \
-		'zonename:string'
+		'timezone:string:GMT0' \
+		'zonename:string:UTC'
 }
 
 system_config() {