From 02c2e2ecbc1d68ad3237ef7c86022b3539b55c63 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 21 Aug 2014 19:57:19 +0200 Subject: [PATCH] Set /etc/localtime as a symlink and abandon /etc/timezone --- platforms/livecd-gnome-root/post.inc.sh | 3 +-- platforms/livecd-light-root/post.inc.sh | 3 +-- platforms/livecd-root/post.inc.sh | 3 +-- platforms/livedvd-root/post.inc.sh | 21 +++++++++++---------- platforms/livegames-root/post.inc.sh | 3 +-- platforms/rootfs-light/post.inc.sh | 21 +-------------------- platforms/rootfs/post.inc.sh | 18 +----------------- platforms/testcd-root/post.inc.sh | 3 +-- platforms/virtualserver/post.inc.sh | 3 +-- 9 files changed, 19 insertions(+), 59 deletions(-) diff --git a/platforms/livecd-gnome-root/post.inc.sh b/platforms/livecd-gnome-root/post.inc.sh index efab007..133454a 100644 --- a/platforms/livecd-gnome-root/post.inc.sh +++ b/platforms/livecd-gnome-root/post.inc.sh @@ -38,8 +38,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # clean rpm database before doing other operations with internal rpm # to fix cross x86/x86_64 installation error: diff --git a/platforms/livecd-light-root/post.inc.sh b/platforms/livecd-light-root/post.inc.sh index 2fc0500..ceae829 100644 --- a/platforms/livecd-light-root/post.inc.sh +++ b/platforms/livecd-light-root/post.inc.sh @@ -27,8 +27,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # clean rpm database before doing other operations with internal rpm # to fix cross x86/x86_64 installation error: diff --git a/platforms/livecd-root/post.inc.sh b/platforms/livecd-root/post.inc.sh index 4e10e8b..f7cd84b 100644 --- a/platforms/livecd-root/post.inc.sh +++ b/platforms/livecd-root/post.inc.sh @@ -34,8 +34,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop; do diff --git a/platforms/livedvd-root/post.inc.sh b/platforms/livedvd-root/post.inc.sh index cc48ddb..639997c 100644 --- a/platforms/livedvd-root/post.inc.sh +++ b/platforms/livedvd-root/post.inc.sh @@ -29,16 +29,17 @@ chroot $MOUNTDIR update-alternatives-set-dri # set timezone according to LANGUAGE (default is UTC) # -case $LANGUAGE in - it) timezone=Europe/Rome ;; - es) timezone=Europe/Madrid ;; - fr) timezone=Europe/Paris ;; - de) timezone=Europe/Berlin ;; - en) timezone=Europe/London ;; - *) timezone=UTC ;; -esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +if [ ! "$MULTILANGUAGE" ]; then + case $LANGUAGE in + it) timezone=Europe/Rome ;; + es) timezone=Europe/Madrid ;; + fr) timezone=Europe/Paris ;; + de) timezone=Europe/Berlin ;; + en) timezone=Europe/London ;; + *) timezone=UTC ;; + esac + ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +fi # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/amarok.desktop; do diff --git a/platforms/livegames-root/post.inc.sh b/platforms/livegames-root/post.inc.sh index ed23951..f2b6920 100644 --- a/platforms/livegames-root/post.inc.sh +++ b/platforms/livegames-root/post.inc.sh @@ -34,8 +34,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop; do diff --git a/platforms/rootfs-light/post.inc.sh b/platforms/rootfs-light/post.inc.sh index 8770fdb..5603a2b 100644 --- a/platforms/rootfs-light/post.inc.sh +++ b/platforms/rootfs-light/post.inc.sh @@ -34,24 +34,6 @@ #chkconfig --del portmap #" -## use system default language -#> $MOUNTDIR/etc/sysconfig/i18n - -# set localtime (default to Europe/Berlin) -case $LANGUAGE in - it) timezone=Europe/Rome ;; - es) timezone=Europe/Madrid ;; - *) timezone=Europe/Berlin ;; -esac -echo $timezone > $MOUNTDIR/etc/timezone -cp /usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime - -# disable automatic depmod and ldconfig execution on boot (also due to clock error) -cat >> $MOUNTDIR/etc/sysconfig/rc << _EOF -no_auto_depmod=1 -no_auto_ldconfig=1 -_EOF - # configure touchscreen cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF TSLIB_CONFFILE=/etc/ts.conf @@ -89,8 +71,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # remove some documentation to save space for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do diff --git a/platforms/rootfs/post.inc.sh b/platforms/rootfs/post.inc.sh index fb9c4b2..49b1ddd 100644 --- a/platforms/rootfs/post.inc.sh +++ b/platforms/rootfs/post.inc.sh @@ -37,21 +37,6 @@ ## use system default language #> $MOUNTDIR/etc/sysconfig/i18n -# set localtime (default to Europe/Berlin) -case $LANGUAGE in - it) timezone=Europe/Rome ;; - es) timezone=Europe/Madrid ;; - *) timezone=Europe/Berlin ;; -esac -echo $timezone > $MOUNTDIR/etc/timezone -cp /usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime - -# disable automatic depmod and ldconfig execution on boot (also due to clock error) -cat >> $MOUNTDIR/etc/sysconfig/rc << _EOF -no_auto_depmod=1 -no_auto_ldconfig=1 -_EOF - # configure touchscreen cat > $MOUNTDIR/etc/ts-calibrate.conf << _EOF TSLIB_CONFFILE=/etc/ts.conf @@ -93,8 +78,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applications/kaffeine.desktop; do diff --git a/platforms/testcd-root/post.inc.sh b/platforms/testcd-root/post.inc.sh index 98d9dfd..739c961 100644 --- a/platforms/testcd-root/post.inc.sh +++ b/platforms/testcd-root/post.inc.sh @@ -34,8 +34,7 @@ case $LANGUAGE in es) timezone=Europe/Madrid ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime # configure favorites in kde menu for f in /usr/share/applications/chromium-devel.desktop; do diff --git a/platforms/virtualserver/post.inc.sh b/platforms/virtualserver/post.inc.sh index ab18cf6..6235b19 100644 --- a/platforms/virtualserver/post.inc.sh +++ b/platforms/virtualserver/post.inc.sh @@ -34,8 +34,7 @@ case $LANGUAGE in it) timezone=Europe/Rome ;; *) timezone=UTC ;; esac -echo $timezone > $MOUNTDIR/etc/timezone -cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime +ln -s ../usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime prelink