From: Michael H. Warfield <mhw@WittsEnd.com>
Date: Sat, 22 Mar 2014 17:57:36 +0000 (-0400)
Subject: Set timezone for new container if not previously defined.
X-Git-Tag: lxc-1.1.0.alpha1~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5067ecbcc1e97052c33269b4afa6375073a91a1;p=thirdparty%2Flxc.git

Set timezone for new container if not previously defined.

If the container does not already contain an /etc/localtime
timezone definition, then copy a definition from the host to
the container.  This is often a symlink to an appropriate
system timezone definition files and is presumed to exist in

Signed-off-by: Michael H. Warfield <mhw@WittsEnd.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-centos.in b/templates/lxc-centos.in
index 55e053137..f11a98cc3 100644
--- a/templates/lxc-centos.in
+++ b/templates/lxc-centos.in
@@ -203,6 +203,13 @@ configure_centos()
         )
     fi
 
+    # Set default localtime to the host localtime if not set...
+    if [ -e /etc/localtime -a ! -e ${rootfs_path}/etc/localtime ]
+    then
+        # if /etc/localtime is a symlink, this should preserve it.
+        cp -a /etc/localtime ${rootfs_path}/etc/localtime
+    fi
+
     # Deal with some dain bramage in the /etc/init.d/halt script.
     # Trim it and make it our own and link it in before the default
     # halt script so we can intercept it.  This also preventions package
diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index fa891212a..f32ca5343 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -176,6 +176,13 @@ configure_fedora()
         )
     fi
 
+    # Set default localtime to the host localtime if not set...
+    if [ -e /etc/localtime -a ! -e ${rootfs_path}/etc/localtime ]
+    then
+        # if /etc/localtime is a symlink, this should preserve it.
+        cp -a /etc/localtime ${rootfs_path}/etc/localtime
+    fi
+
     # Deal with some dain bramage in the /etc/init.d/halt script.
     # Trim it and make it our own and link it in before the default
     # halt script so we can intercept it.  This also preventions package