diff options
| author |   Eric Hameleers <alien@slackware.com> | 2016-04-29 09:47:16 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2016-04-29 09:47:16 +0200 |
| commit | 6680a79351316d024b10db2814ce77fee3bff194 (patch) | |
| tree | 833cfe319343934a7f298f0e543e78421be45720 /make_slackware_live.sh | |
| parent | d59ade023c7341e2311a51696cf8eeb6c2d2a6ee (diff) | |
| download | liveslak-6680a79351316d024b10db2814ce77fee3bff194.tar.gz liveslak-6680a79351316d024b10db2814ce77fee3bff194.tar.xz | |
Update the 'timeconfig' script in make_slackware_live.sh, not in liveinit.
Diffstat (limited to 'make_slackware_live.sh')
| -rwxr-xr-x | make_slackware_live.sh | 9 |
1 files changed, 9 insertions, 0 deletions
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 |