Merge lp:~larryprice/libertine/saved-lxd-root into lp:libertine

[Larry Price]

Keep the original root path around when updating bind mounts in lxd.

Keep the original root path around when updating bind mounts in lxd.

On latest zesty, defining the root path causes a bind mount save error. On x+o, not defining the root path causes a bind mount save error. The reason we originally defined it was because it was a "default" device pre-created on container creation by lxd; this is no longer the case and my assumption is that they deal with it internally (especially since '/' is the only allowed value). The solution here is to save it if it exists; otherwise pretend it's not there.

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

PASSED: Continuous integration, rev:400
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/413/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/776
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/640
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/640
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/640
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/640
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/786
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/767
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/767/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/767
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/767/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/767
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/767/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/767
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/767/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, works for me

review: Approve

=== modified file 'python/libertine/LxdContainer.py'
--- python/libertine/LxdContainer.py	2017-02-22 19:04:25 +0000
+++ python/libertine/LxdContainer.py	2017-02-24 14:06:50 +0000
@@ -217,7 +217,11 @@
 def update_bind_mounts(container, config, home_path):
     userdata_dir = utils.get_libertine_container_home_dir(container.name)
 
+    old_root = container.devices.get('root')
     container.devices.clear()
+    if old_root:
+        container.devices['root'] = old_root
+
     container.devices['home'] = {'type': 'disk', 'path': home_path, 'source': userdata_dir}
 
     # applications and icons directories