diff options
author | Eric Hameleers <alien@slackware.com> | 2016-04-27 16:44:35 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-04-27 16:44:35 +0200 |
commit | aa67a52a969f3ef336b845857c48a76a5e319987 (patch) | |
tree | b1f7cf606da9b9fec896c363ba6195e311defccd | |
parent | e1ea9877dbb64a962028201731c810d4a5789ed1 (diff) | |
download | liveslak-aa67a52a969f3ef336b845857c48a76a5e319987.tar.gz liveslak-aa67a52a969f3ef336b845857c48a76a5e319987.tar.xz |
Deal with custom timezones (non-UTC) in KDE4 and PLASMA5.
-rwxr-xr-x | liveinit | 11 | ||||
-rwxr-xr-x | make_slackware_live.sh | 19 |
2 files changed, 30 insertions, 0 deletions
@@ -815,6 +815,17 @@ EOT # You should run timeconfig to edit this file. localtime 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}%" \ + /mnt/overlay/home/live/.kde/share/config/ktimezonedrc + sed -i -e "s%^LocalZone=.*%LocalZone=${TZ}%" \ + /mnt/overlay/home/live/.config/ktimezonedrc fi if [ ! -z "$LIVEPW" ]; then diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 936ca30..b63cb2a 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1297,6 +1297,16 @@ DefaultProfile=Shell.profile EOT +# Configure (default) UTC timezone so we can change it during boot: +mkdir -p ${LIVE_ROOTDIR}/etc/skel/.kde/share/config +cat <<EOT > ${LIVE_ROOTDIR}/etc/skel/.kde/share/config/ktimezonedrc +[TimeZones] +LocalZone=UTC +ZoneinfoDir=/usr/share/zoneinfo +Zonetab=/usr/share/zoneinfo/zone.tab +ZonetabCache= +EOT + if [ "$LIVEDE" = "PLASMA5" ]; then # -------------------------------------------------------------------------- # @@ -1346,6 +1356,15 @@ KRES_EOF alreadyMigrated=true KWALLET_EOL + # Configure (default) UTC timezone so we can change it during boot: + mkdir -p ${LIVE_ROOTDIR}/etc/skel/.config + cat <<EOTZ > ${LIVE_ROOTDIR}/etc/skel/.config/ktimezonedrc +[TimeZones] +LocalZone=UTC +ZoneinfoDir=/usr/share/zoneinfo +Zonetab=/usr/share/zoneinfo/zone.tab +EOTZ + # Make sure that Plasma and SDDM work on older GPUs, # by forcing Qt5 to use software GL rendering: cat <<"EOGL" >> ${LIVE_ROOTDIR}/usr/share/sddm/scripts/Xsetup |