aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2021-06-24 07:42:53 -1000
committerPaul Spooren <mail@aparcar.org>2021-06-24 20:00:20 -1000
commit56bdb6bb9781f8a0bbec5fc3075b9d2b8d12f9a8 (patch)
tree8365f97ac6087cf0f09a93848f97d514f804fcd3
parent18c24a29f94ba56ecbee8c7a818368f9ef162527 (diff)
downloadupstream-56bdb6bb9781f8a0bbec5fc3075b9d2b8d12f9a8.tar.gz
upstream-56bdb6bb9781f8a0bbec5fc3075b9d2b8d12f9a8.tar.bz2
upstream-56bdb6bb9781f8a0bbec5fc3075b9d2b8d12f9a8.zip
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>
-rwxr-xr-xpackage/base-files/files/etc/init.d/system11
1 files changed, 4 insertions, 7 deletions
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