Merge lp:~townsend/libertine/fix-lxc-timezone into lp:libertine

[Christopher Townsend]

data/libertine-lxc.conf: Remove the /etc/timezone & /etc/localtime bind-mounts.
python/libertine/LxcContainer.py: Check to see if the LXC's timezone matches the host's timezone, and if not, reconfigure the LXC to match.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:171
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/109/
Executed test runs:
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1006/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/109/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

The container timezone only gets updated when packages are updated?

review: Needs Information

[Christopher Townsend (townsend)]

The timezone will be updated a container creation time because it call update_packages(). It will also look to see if the host's timezone has changed when packages are updated as well. I thought it would be a bit heavy handed to check and possibly set the timezone every time the container is started, so I thought putting it in update_packages() was a good compromise.

[Stephen M. Webb (bregma)]

I suspect there will be complaints about the contained timezone not being correct, but until it's integrated with the changing of the timezone outside of the container somehow this is an acceptable compromise.

review: Approve

=== modified file 'data/libertine-lxc.conf'
--- data/libertine-lxc.conf	2015-12-22 19:04:27 +0000
+++ data/libertine-lxc.conf	2016-02-04 14:23:32 +0000
@@ -1,7 +1,5 @@
 lxc.mount.entry = /dev/dri dev/dri none bind,create=dir
 lxc.mount.entry = /tmp/.X11-unix tmp/.X11-unix/ none bind,create=dir
 lxc.mount.entry = /dev/fuse dev/fuse none bind,optional,create=file
-lxc.mount.entry = /etc/localtime etc/localtime none bind
-lxc.mount.entry = /etc/timezone etc/timezone none bind
 lxc.mount.entry = /usr/lib/locale usr/lib/locale none bind
 lxc.tty = 0

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-02-02 21:09:07 +0000
+++ python/libertine/LxcContainer.py	2016-02-04 14:23:32 +0000
@@ -63,6 +63,13 @@
     return container
 
 
+def get_host_timezone():
+    with open(os.path.join('/', 'etc', 'timezone'), 'r') as fd:
+        host_timezone = fd.read().strip('\n')
+
+    return host_timezone
+
+
 class LibertineLXC(BaseContainer):
     """
     A concrete container type implemented using an LXC container.
@@ -76,6 +83,17 @@
     def is_running(self):
         return self.container.running
 
+    def timezone_needs_update(self):
+        host_timezone = get_host_timezone()
+
+        with open(os.path.join(self.root_path, 'etc', 'timezone'), 'r') as fd:
+            container_timezone = fd.read().strip('\n')
+
+        if host_timezone == container_timezone:
+            return False
+        else:
+            return True
+
     def start_container(self):
         if not self.container.running:
             if not self.container.start():
@@ -96,6 +114,15 @@
         cmd_args = shlex.split(command_string)
         return self.container.attach_wait(lxc.attach_run_command, cmd_args)
 
+    def update_packages(self, verbosity=1):
+        if self.timezone_needs_update():
+            self.run_in_container("bash -c \'echo \"{}\" >/etc/timezone\'".format(
+                                  get_host_timezone()))
+            self.run_in_container("rm -f /etc/localtime")
+            self.run_in_container("dpkg-reconfigure -f noninteractive tzdata")
+
+        super().update_packages(verbosity)
+
     def destroy_libertine_container(self):
         if self.container.defined:
             self.container.stop()