From 737a60de83194f3ebc63149ccf54c712d22379ea Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 31 Mar 2018 15:02:11 +0200
Subject: Adapt to new behaviour of glibc-zoneinfo and the timeconfig script

---
 liveinit.tpl           | 2 +-
 make_slackware_live.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/liveinit.tpl b/liveinit.tpl
index 48f4525..5cddd02 100755
--- a/liveinit.tpl
+++ b/liveinit.tpl
@@ -947,7 +947,7 @@ EOT
     # Configure custom timezone:
     echo "${MARKER}:  Configuring timezone '$TZ'"
     cp /mnt/overlay/usr/share/zoneinfo/${TZ} /mnt/overlay/etc/localtime
-    rm /mnt/overlay/etc/localtime-copied-from
+    rm -f /mnt/overlay/etc/localtime-copied-from
     ln -s /usr/share/zoneinfo/${TZ} /mnt/overlay/etc/localtime-copied-from
     # Configure the hardware clock to be interpreted as localtime and not UTC:
     cat <<EOT > /mnt/overlay/etc/hardwareclock
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 40d1ae9..fd185c2 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1219,9 +1219,10 @@ fi
 echo "LANG=en_US.UTF-8" > ${LIVE_ROOTDIR}/etc/locale.conf
 echo "KEYMAP=us" > ${LIVE_ROOTDIR}/etc/vconsole.conf
 
-# Set timezone to UTC:
+# Set timezone to UTC, mimicking the 'timeconfig' script in Slackware:
 cp -a ${LIVE_ROOTDIR}/usr/share/zoneinfo/UTC ${LIVE_ROOTDIR}/etc/localtime
-rm ${LIVE_ROOTDIR}/etc/localtime-copied-from
+# Could be absent so 'rm -f' to avoid script aborts:
+rm -f ${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
-- 
cgit v1.2.3