Merge lp:~townsend/libertine/fix-create-lxc-log into lp:libertine

[Christopher Townsend]

Only set the lxc log when a container is defined during class init. Also, load the default config first and then set the lxc log when creating a new lxc container.

[Christopher Townsend (townsend)]

Hmm, lxc.logfile is being added to the config file in the container's directory. Need to fix that...

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

PASSED: Continuous integration, rev:355
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/293/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/597
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/484
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/484
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/484
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/484
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/607
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/589
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/589/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/589
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/589/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/589
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/589/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/589
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/589/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/293/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, the lxc.logfile entry is harmless as the new temp location is used when _set_lxc_log() is called during another operation. I'll leave the line in there as the alternative to work around that is ugly.

[Larry Price (larryprice)]

lgtm, though upstream lxc seems to be broken on zesty -_-

review: Approve

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-11-21 17:18:55 +0000
+++ python/libertine/LxcContainer.py	2017-01-04 16:39:29 +0000
@@ -130,11 +130,13 @@
         super().__init__(container_id)
         self.container_type = "lxc"
         self.container = lxc_container(container_id)
-        self._set_lxc_log()
         self.lxc_manager_interface = None
         self.window_manager = None
         self.host_info = HostInfo.HostInfo()
 
+        if self.container.defined:
+            self._set_lxc_log()
+
         utils.set_session_dbus_env_var()
 
         try:
@@ -220,6 +222,9 @@
                 fd.write("lxc.id_map = u %s %s %s\n" % (user_id + 1, (user_id + 1) + 100000, 65536 - (user_id + 1)))
                 fd.write("lxc.id_map = g %s %s %s\n" % (group_id + 1, (group_id + 1) + 100000, 65536 - (user_id + 1)))
 
+        self.container.load_config(config_file)
+        self._set_lxc_log()
+ 
         utils.create_libertine_user_data_dir(self.container_id)
 
         with EnvLxcSettings():