From 7f11b6fbcd0923b3081cafc2043c33d6ecf2faae4116f8a2651132c27df450ff Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 27 May 2013 08:08:31 +0000 Subject: [PATCH] Accepting request 176195 from Base:System - /etc/localtime must be a symlink to /usr/share/zoneinfo/$TIMEZONE so systemd-timedated and its command line tool timedatectl can work correctly. Yast already does the right thing. (forwarded request 176102 from elvigia) OBS-URL: https://build.opensuse.org/request/show/176195 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/timezone?expand=0&rev=74 --- timezone.changes | 7 +++++++ timezone.spec | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/timezone.changes b/timezone.changes index 82df9ef..a18e392 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 29 20:47:33 UTC 2013 - crrodriguez@opensuse.org + +- /etc/localtime must be a symlink to /usr/share/zoneinfo/$TIMEZONE + so systemd-timedated and its command line tool timedatectl + can work correctly. Yast already does the right thing. + ------------------------------------------------------------------- Sat Apr 20 16:41:02 UTC 2013 - crrodriguez@opensuse.org diff --git a/timezone.spec b/timezone.spec index 43fbda8..22ff50b 100644 --- a/timezone.spec +++ b/timezone.spec @@ -92,9 +92,7 @@ if [ -f /etc/sysconfig/clock ]; then . /etc/sysconfig/clock if [ -n "$TIMEZONE" -a -f /etc/localtime -a -f /usr/share/zoneinfo/$TIMEZONE ]; then - new=$(mktemp /etc/localtime.XXXXXXXX) || exit 1 - cp -l /usr/share/zoneinfo/$TIMEZONE $new 2>/dev/null || cp -fp /usr/share/zoneinfo/$TIMEZONE $new - mv -f $new /etc/localtime + ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime else [ ! -f /etc/localtime ] || echo "WARNING: Not updating /etc/localtime with new zone file" >&2 fi