From 6680a79351316d024b10db2814ce77fee3bff194 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 29 Apr 2016 09:47:16 +0200
Subject: Update the 'timeconfig' script in make_slackware_live.sh, not in
 liveinit.

---
 liveinit               | 2 --
 make_slackware_live.sh | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/liveinit b/liveinit
index bd251e6..5211629 100755
--- a/liveinit
+++ b/liveinit
@@ -818,8 +818,6 @@ EOT
     # QT5 expects "/etc/localtime" to be a symlink. Slackware's file is a real
     # file so QT5 fails to determine the timezone and falls back to UTC. Fix:
     echo ${TZ} > /mnt/overlay/etc/timezone
-    sed -i -n "p;s/^\( *\)rm -f localtime$/\1echo \$TZ > timezone/p" \
-      /mnt/overlay//usr/sbin/timeconfig
 
     # KDE4 and PLASMA5 user timezone re-configuration:
     sed -i -e "s%^LocalZone=.*%LocalZone=${TZ}%" \
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 76471b3..11872a4 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -948,6 +948,15 @@ cp -a ${LIVE_ROOTDIR}/usr/share/zoneinfo/UTC ${LIVE_ROOTDIR}/etc/localtime
 rm ${LIVE_ROOTDIR}/etc/localtime-copied-from
 ln -s /usr/share/zoneinfo/UTC ${LIVE_ROOTDIR}/etc/localtime-copied-from
 
+# Qt5 expects '/etc/localtime' to be a symlink, but in Slackware this is a
+# real file.  This causes Qt5 timezone detection to fail so that "UTC"
+# will be returned always.  However if a file '/etc/timezone' exists, Qt5
+# will use that.  Until this is fixed (either in Slackware or in Qt5) we
+# add the file and update the 'timeconfig' script accordingly:
+echo "UTC" > ${LIVE_ROOTDIR}/etc/timezone
+sed -i -n "p;s/^\( *\)rm -f localtime$/\1echo \$TZ > timezone/p" \
+  ${LIVE_ROOTDIR}/usr/sbin/timeconfig
+
 # Configure the hardware clock to be interpreted as UTC as well:
 cat <<EOT > ${LIVE_ROOTDIR}/etc/hardwareclock 
 # /etc/hardwareclock
-- 
cgit v1.2.3