diff -Nru cgmanager-0.36/debian/changelog cgmanager-0.36/debian/changelog
--- cgmanager-0.36/debian/changelog	2015-04-02 15:19:50.000000000 +0000
+++ cgmanager-0.36/debian/changelog	2015-04-06 21:42:40.000000000 +0000
@@ -1,3 +1,11 @@
+cgmanager (0.36-2ubuntu5) vivid; urgency=medium
+
+  * Mount tmpfs onto /root later, otherwise cgmanager at boot will frequently
+    spin trying to open root/.dbus-keyrings/org_freedesktop_general.lock for
+    writing on a readonly-at-boot /.
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Mon, 06 Apr 2015 16:41:31 -0500
+
 cgmanager (0.36-2ubuntu4) vivid; urgency=medium
 
   * Handle user passing in a list of co-mounted controllers (LP: #1438345)
diff -Nru cgmanager-0.36/debian/patches/0007-mount-tmpfs-onto-root-after-pivot_root.patch cgmanager-0.36/debian/patches/0007-mount-tmpfs-onto-root-after-pivot_root.patch
--- cgmanager-0.36/debian/patches/0007-mount-tmpfs-onto-root-after-pivot_root.patch	1970-01-01 00:00:00.000000000 +0000
+++ cgmanager-0.36/debian/patches/0007-mount-tmpfs-onto-root-after-pivot_root.patch	2015-04-06 21:41:30.000000000 +0000
@@ -0,0 +1,52 @@
+From 7a140e8743f816f7db0d919f61d99d9aaf1897e8 Mon Sep 17 00:00:00 2001
+From: Serge Hallyn <serge.hallyn@ubuntu.com>
+Date: Mon, 6 Apr 2015 16:39:42 -0500
+Subject: [PATCH 1/1] mount tmpfs onto /root after pivot_root
+
+Otherwise we end up losing that mount, and we can again lock on attempts
+to open /root/.dbus-keyrings/org_freedesktop_general.lock O_WRONLY with
+/ readonly.
+
+Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+---
+ fs.c | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+Index: cgmanager-0.36/fs.c
+===================================================================
+--- cgmanager-0.36.orig/fs.c
++++ cgmanager-0.36/fs.c
+@@ -995,16 +995,6 @@ int setup_cgroup_mounts(void)
+ 		return -1;
+ 	}
+ 
+-	/*
+-	 * Mount a tmpfs on top of /root in case / is still ro when we
+-	 * started, so we can write the org_freedesktop_general.lock
+-	 */
+-	if (dir_exists("/root")) {
+-		if (mount("root", "/root", "tmpfs", 0, "size=10000") < 0) {
+-			nih_warn("Failed to mount a writeable tmpfs onto /root");
+-		}
+-	}
+-
+ 	for (i=0; i<num_controllers; i++) {
+ 		if (!do_mount_subsys(i)) {
+ 			nih_fatal("Failed mounting cgroups");
+@@ -1018,6 +1008,16 @@ int setup_cgroup_mounts(void)
+ 		return -1;
+ 	}
+ 
++	/*
++	 * Mount a tmpfs on top of /root in case / is still ro when we
++	 * started, so we can write the org_freedesktop_general.lock
++	 */
++	if (dir_exists("/root")) {
++		if (mount("root", "/root", "tmpfs", 0, "size=10000") < 0) {
++			nih_warn("Failed to mount a writeable tmpfs onto /root");
++		}
++	}
++
+ 	return 0;
+ }
+ 
diff -Nru cgmanager-0.36/debian/patches/series cgmanager-0.36/debian/patches/series
--- cgmanager-0.36/debian/patches/series	2015-04-02 14:22:09.000000000 +0000
+++ cgmanager-0.36/debian/patches/series	2015-04-06 21:41:25.000000000 +0000
@@ -5,3 +5,4 @@
 0005-Fix-the-last-commit.patch
 0006-cgmanager-make-exception-for-proxys-placed-in-system.patch
 fix-comounts
+0007-mount-tmpfs-onto-root-after-pivot_root.patch