From: Paul Spooren <mail@aparcar.org>
Date: Thu, 24 Jun 2021 17:42:53 +0000 (-1000)
Subject: base-files: fix /tmp/TZ when zoneinfo not installed
X-Git-Tag: v22.03.0-rc1~2266
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=56bdb6bb9781f8a0bbec5fc3075b9d2b8d12f9a8;p=openwrt%2Fopenwrt.git

base-files: fix /tmp/TZ when zoneinfo not installed

The zoneinfo packages are not installed per default so neither
/tmp/localtime nor /tmp/TZ is generated.

This patch mostly reverts the previous fix and instead incooperates a
solution suggested by Jo.

Fixes "base-files: fix zoneinfo support " 8af62ed

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/package/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
index 2290964d7e..dcfc2616c6 100755
--- a/package/base-files/files/etc/init.d/system
+++ b/package/base-files/files/etc/init.d/system
@@ -21,13 +21,10 @@ system_config() {
 
 	echo "$hostname" > /proc/sys/kernel/hostname
 	[ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}
-	rm -f /tmp/TZ
-	if [ -n "$zonename" ]; then
-		local zname=$(echo "$zonename" | tr ' ' _)
-		[ -f "/usr/share/zoneinfo/$zname" ] && ln -sf "/usr/share/zoneinfo/$zname" /tmp/localtime
-	else
-		echo "$timezone" > /tmp/TZ
-	fi
+	echo "$timezone" > /tmp/TZ
+	[ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/${zonename// /_}" ] \
+		&& ln -sf "/usr/share/zoneinfo/${zonename// /_}" /tmp/localtime \
+		&& rm -f /tmp/TZ
 
 	# apply timezone to kernel
 	hwclock -u --systz