[Xen-devel] [OSSTEST PATCH] i18n/l10n: Make Timezone configurable and change the default

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

* 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 <Ian.Jackson@xxxxxxxxxxxxx>
---
 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
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel