i18n/l10n: Make Timezone configurable and change the default

* 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@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/Osstest.pm b/Osstest.pm
index 7f72bc69a1ffc0e76462ceec68c9c26a5bc7e018..e8bd77bf3a02dd52257b0c5f1d8188e75c0b8ac9 100644 (file)
--- 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 2b44396d1cd3b1b78deb27fcf61b69ef93476220..e2fa565dabe205224c47bf75d833350811954875 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -636,7 +636,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/README b/README
index 0aaba2cbc21bb80d06b11aae516acdb719b9e061..44e298997f561a767d5a574a4eb7be54a3e504c2 100644 (file)
--- a/README
+++ b/README
@@ -476,6 +476,9 @@ TftpPxeTemplatesReal
     Template filename which mg-hosts mkpxedir should make be a symlink to
     the TftpPxeTemplates.  Not used otherwise.
 
+Timezone
+    Olson TZ name, used by host and guest installers
+
 ========================================
 
 Host-specific config settigs

diff --git a/production-config-cambridge b/production-config-cambridge
index 62215d0abeb6fa8d12f00aea23ef286126c4f70b..f32cd842a7332d4d8bcfb59f6d3669c5133d6aa1 100644 (file)
--- 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 6e8fada0908d426f52d2b393cf6ab3a8f490786f..0d6eb0c4f0c3b8a94a1cd64a43819829c1ce2e27 100755 (executable)
--- 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 22c30613d9956a9120e3bc6ef81109cdb9ae1406..10da55936b6f7372b97e985f622a5d61b766002c 100755 (executable)
--- 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