Merge lp:~townsend/libertine/mount-dconf into lp:libertine

[Christopher Townsend]

Bind mount ~/.config/dconf/ so apps that use it can read the correct gsettings data.

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

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

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

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

review: Approve

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2016-01-27 21:54:55 +0000
+++ python/libertine/ChrootContainer.py	2016-02-02 21:16:57 +0000
@@ -191,6 +191,11 @@
             bind_mounts += " -b %s:%s" % (user_dir_path, user_dir_path)
 
         proot_cmd += bind_mounts
+
+        user_dconf_path = os.path.join(home_path, '.config', 'dconf')
+        if os.path.exists(user_dconf_path):
+            proot_cmd += " -b %s" % user_donf_path
+
         return proot_cmd
 
     def launch_application(self, app_exec_line):

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2015-12-22 17:28:10 +0000
+++ python/libertine/LxcContainer.py	2016-02-02 21:16:57 +0000
@@ -185,6 +185,14 @@
             )
             self.container.append_config_item("lxc.mount.entry", xdg_user_dir_entry)
 
+        # Bind mount the user's dconf back end
+        user_dconf_path = os.path.join(home_path, '.config', 'dconf')
+        user_dconf_entry = (
+            "%s %s none bind,create=dir,optional"
+            % (user_dconf_path, user_dconf_path.strip('/'))
+        )
+        self.container.append_config_item("lxc.mount.entry", user_dconf_entry)
+
         # Setup the mounts for /run/user/$user_id
         run_user_entry = "/run/user/%s run/user/%s none rbind,create=dir" % (user_id, user_id)
         self.container.append_config_item("lxc.mount.entry", "tmpfs run tmpfs rw,nodev,noexec,nosuid,size=5242880")