From 80c5fd262cb22446fbb465e6896b90a5854345da Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 12 Aug 2009 23:45:08 +0200 Subject: [PATCH] Set UTC=no by default --- debian/changelog | 4 +++- etc/grml/fai/config/class/GRMLBASE.var | 4 ++-- etc/grml/fai/config/scripts/GRMLBASE/18-timesetup | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ab497f3..79e3bd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,13 +25,15 @@ grml-live (0.9.21) UNRELEASED; urgency=low * Drop hydra from GRML_FULL (the license is not a clean GPL one). * Drop bar from GRML_FULL (no release since 2007, consider using cpipe instead). + * Set UTC=no by default. See http://bts.grml.org/grml/issue708 for + details. Credits to Ulrich Zehl for debugging. [ Thorsten Glaser ] * Update MirOS bsd4grml to 20090812 and sync menu.lst, grub.cfg, isolinux.cfg, syslinux.cfg with each other; provide a fallback way to boot MirOS bsd4grml from both GRUB versions using modules - -- Michael Prokop Tue, 11 Aug 2009 16:57:41 +0200 + -- Michael Prokop Wed, 12 Aug 2009 23:44:41 +0200 grml-live (0.9.20) unstable; urgency=low diff --git a/etc/grml/fai/config/class/GRMLBASE.var b/etc/grml/fai/config/class/GRMLBASE.var index 1d203d9..e7ce51b 100644 --- a/etc/grml/fai/config/class/GRMLBASE.var +++ b/etc/grml/fai/config/class/GRMLBASE.var @@ -6,8 +6,8 @@ FAI_ALLOW_UNSIGNED=1 CONSOLEFONT= KEYMAP=us-latin1 -# Set UTC=yes if your system clock is set to UTC (GMT), and UTC=no if not. -UTC=yes +# Set UTC=yes if your system clock is set to UTC (GMT) and UTC=no if not. +UTC=no TIMEZONE=Europe/Vienna # root password for the new installed linux system; md5 and crypt are possible diff --git a/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup b/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup index e3d27a6..57c288b 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/18-timesetup @@ -10,6 +10,7 @@ set -u set -e # tell if hwclock is running in UTC or local time +# by default it's set to UTC=yes, we usually want UTC=no if [ -n "$UTC" ] ; then echo "Setting hwclock parameter UTC to $UTC" sed -i "s|^UTC=.*$|UTC="$UTC"|" $target/etc/default/rcS -- 2.1.4