From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [OSSTEST PATCH] i18n/l10n: Make Timezone configurable and change the default Date: Fri, 15 May 2015 12:34:35 +0100 Message-ID: <1431689675.8943.94.camel@citrix.com> References: <1431686686-25880-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtDt6-0004rb-4R for xen-devel@lists.xenproject.org; Fri, 15 May 2015 11:34:44 +0000 In-Reply-To: <1431686686-25880-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Jackson Cc: xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org On Fri, 2015-05-15 at 11:44 +0100, Ian Jackson wrote: > * Introduce a new config option Timezone > * Replace hardcoded Europe/London everywhere with $c{Timezone} > * The default is UTC > * But in production-config-cambridge set it to Europe/London > > The overall effect is: > * No change in Cambridge > * Default timezone changes to UTC but can now be overridden > * Production instance timezone changes to UTC > > (It appears that there is no reasonable way to find out the Olson TZ > name of the controller host's default timezone. If there were, or we > discover one, we should arrange that the default is set > appropriately.) > > Signed-off-by: Ian Jackson Acked-by: Ian Campbell (I wouldn't have objected to moving Cambridge to UTC either, lets see how confused we get looking at machines in both pools!) > --- > Osstest.pm | 2 ++ > Osstest/Debian.pm | 2 +- > production-config-cambridge | 2 ++ > ts-freebsd-install | 2 +- > ts-redhat-install | 2 +- > 5 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/Osstest.pm b/Osstest.pm > index 7f72bc6..e8bd77b 100644 > --- a/Osstest.pm > +++ b/Osstest.pm > @@ -76,6 +76,8 @@ our %c = qw( > DebianNonfreeFirmware firmware-bnx2 > > HostnameSortSwapWords 0 > + > + Timezone UTC > ); > > $c{$_}='' foreach qw( > diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm > index a577d1d..3adc84f 100644 > --- a/Osstest/Debian.pm > +++ b/Osstest/Debian.pm > @@ -567,7 +567,7 @@ d-i mirror/country string manual > d-i mirror/http/proxy string > > d-i clock-setup/utc boolean true > -d-i time/zone string Europe/London > +d-i time/zone string $c{Timezone} > d-i clock-setup/ntp boolean true > > d-i partman-md/device_remove_md boolean true > diff --git a/production-config-cambridge b/production-config-cambridge > index 62215d0..f32cd84 100644 > --- a/production-config-cambridge > +++ b/production-config-cambridge > @@ -30,6 +30,8 @@ HostnameSortSwapWords 1 > DnsDomain xs.citrite.net > NetNameservers 10.80.248.2 10.80.16.28 10.80.16.67 > > +Timezone Europe/London > + > Stash /home/xc_osstest/logs > Images /home/xc_osstest/images > Logs /home/xc_osstest/logs > diff --git a/ts-freebsd-install b/ts-freebsd-install > index 6e8fada..0d6eb0c 100755 > --- a/ts-freebsd-install > +++ b/ts-freebsd-install > @@ -82,7 +82,7 @@ END > > sed -i '/^ttyu0/s/off/on/' $mnt/etc/ttys > > - cp $mnt/usr/share/zoneinfo/Europe/London $mnt/etc/localtime > + cp $mnt/usr/share/zoneinfo/$c{Timezone} $mnt/etc/localtime > > cat <<'ENDKEYS' >$mnt/boot/loader.conf > boot_multicons="YES" > diff --git a/ts-redhat-install b/ts-redhat-install > index 22c3061..10da559 100755 > --- a/ts-redhat-install > +++ b/ts-redhat-install > @@ -59,7 +59,7 @@ selinux --disable > sshpw --username=root xenroot --plaintext > sshpw --username=iwj xenroot --plaintext > > -timezone --utc Europe/London > +timezone --utc $c{Timezone} > bootloader --location=mbr --driveorder=sda --append="crashkernel=auto rhgb console=ttyS0,$c{Baud}n8" > > # The following is the partition information you requested