aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2021-06-24 07:42:53 -1000
committerPaul Spooren <mail@aparcar.org>2021-06-25 14:56:48 -1000
commit71fa524e1bef2b266d9ed3ee94c2b7ff9d8e59b0 (patch)
tree8548fa45048213fad0dbb18256009650d203668e /package/base-files
parentc88bdb8294a73e0eaa3cd86e843564a8244b333c (diff)
downloadupstream-71fa524e1bef2b266d9ed3ee94c2b7ff9d8e59b0.tar.gz
upstream-71fa524e1bef2b266d9ed3ee94c2b7ff9d8e59b0.tar.bz2
upstream-71fa524e1bef2b266d9ed3ee94c2b7ff9d8e59b0.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> (cherry picked from commit 56bdb6bb9781f8a0bbec5fc3075b9d2b8d12f9a8)
Diffstat (limited to 'package/base-files')
-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 219b29812d..62cf2db3dd 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
date -k