Merge lp:~larryprice/libertine/lxd-run-user into lp:libertine

[Larry Price]

Manually execute lxd bind mount script to fix /run/user and remove service

Manually execute lxd bind mount script to fix /run/user and remove service

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

PASSED: Continuous integration, rev:327
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/301/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/611
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/497
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/497
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/497
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/497
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/621
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/603
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/603/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/603
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/603/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/603
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/603/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/603
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/603/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~larryprice/libertine/lxd-run-user]

328. By Larry Price on 2017-01-06

only run the bin on application start

329. By Larry Price on 2017-01-06

oops self

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

FAILED: Continuous integration, rev:328
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/302/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/612/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/622
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/604
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/604/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/604
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/604/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/604
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/604/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/604/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:329
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/303/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/613
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/498
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/498
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/498
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/498
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/623
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/605
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/605
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/605
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/605/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/605
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/605/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, works for me. Thanks!

review: Approve

=== modified file 'python/libertine/LxdContainer.py'
--- python/libertine/LxdContainer.py	2017-01-05 20:16:25 +0000
+++ python/libertine/LxdContainer.py	2017-01-06 21:59:14 +0000
@@ -98,20 +98,6 @@
 
 
 def _setup_bind_mount_service(container, uid, username):
-    utils.get_logger().info("Creating systemd mount override service")
-    service = '''
-[Unit]
-Description=Fix system mounts for libertine
-
-[Service]
-ExecStart=/usr/bin/libertine-lxd-mount-update
-
-[Install]
-WantedBy=multi-user.target
-'''[1:-1]
-    container.files.put('/etc/systemd/system/libertine-lxd-mount-update.service', service.encode('utf-8'))
-    container.execute(shlex.split('chmod 644 /etc/systemd/system/libertine-lxd-mount-update.service'))
-
     utils.get_logger().info("Creating mount update shell script")
     script = '''
 #!/bin/sh
@@ -128,9 +114,6 @@
     container.files.put('/usr/bin/libertine-lxd-mount-update', script.format(uid=uid, username=username).encode('utf-8'))
     container.execute(shlex.split('chmod 755 /usr/bin/libertine-lxd-mount-update'))
 
-    utils.get_logger().info("Enabling systemd mount update service")
-    container.execute(shlex.split('systemctl enable libertine-lxd-mount-update.service'))
-
 
 def lxd_container(client, container_id):
     try:
@@ -404,6 +387,8 @@
             utils.get_logger().error("Could not get container '{}'".format(self._id))
             return None
 
+        requires_remount = self._container.status != 'Running'
+
         if self._manager:
             result = LifecycleResult.from_dict(self._manager.app_start(self._id))
         else:
@@ -415,6 +400,9 @@
             utils.get_logger().error(result.error)
             return False
 
+        if requires_remount:
+            self._container.execute(shlex.split('/usr/bin/libertine-lxd-mount-update'))
+
         args = self._lxc_args("sudo -E -u {} env PATH={}".format(os.environ['USER'], environ['PATH']), environ)
 
         self._start_window_manager(args.copy())