diff -Nru cgmanager-0.24/debian/changelog cgmanager-0.24/debian/changelog
--- cgmanager-0.24/debian/changelog	2015-02-12 05:23:21.000000000 +0000
+++ cgmanager-0.24/debian/changelog	2015-09-16 17:07:21.000000000 +0000
@@ -1,3 +1,18 @@
+cgmanager (0.24-0ubuntu7.5) trusty-proposed; urgency=medium
+
+  * Fix d/p/0011-mount_tmpfs_onto_root.patch which was badly
+    cherrypicked.
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Wed, 16 Sep 2015 12:06:58 -0500
+
+cgmanager (0.24-0ubuntu7.4) trusty-proposed; urgency=medium
+
+  * d/p/0011-mount_tmpfs_onto_root.patch: mount a tmpfs onto /root to avoid
+    hanging trying to open /root/.dbus-keyrings/org_freedesktop_general.lock
+    (LP: #1493135)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Mon, 07 Sep 2015 14:14:43 -0500
+
 cgmanager (0.24-0ubuntu7.3) trusty-proposed; urgency=medium
 
   * 0010-Fix-subdirectory-check.patch: prevent a task from administering
diff -Nru cgmanager-0.24/debian/patches/0011-mount_tmpfs_onto_root.patch cgmanager-0.24/debian/patches/0011-mount_tmpfs_onto_root.patch
--- cgmanager-0.24/debian/patches/0011-mount_tmpfs_onto_root.patch	1970-01-01 00:00:00.000000000 +0000
+++ cgmanager-0.24/debian/patches/0011-mount_tmpfs_onto_root.patch	2015-09-16 17:07:50.000000000 +0000
@@ -0,0 +1,34 @@
+commit a68d5f4dd94f84388143b5d140a4e8e2d95989d9
+Author: Serge Hallyn <serge.hallyn@ubuntu.com>
+Date:   Thu Oct 16 11:59:52 2014 +0200
+
+    Mount a tmpfs onto /root
+    
+    cgmanager starts early enough that it may have a ro /.  Mount a
+    writeable tmpfs onto /root so that we can write lockfiles etc.
+    Without this, we sometimes end up hanging due to EROFS when doing
+    opening /root/.dbus-keyrings/org_freedesktop_general.lock.
+    
+    Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
+
+Index: cgmanager-0.24/fs.c
+===================================================================
+--- cgmanager-0.24.orig/fs.c
++++ cgmanager-0.24/fs.c
+@@ -361,6 +361,16 @@ int setup_cgroup_mounts(void)
+ 		}
+ 	}
+ 
++	/*
++	 * 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.24/debian/patches/series cgmanager-0.24/debian/patches/series
--- cgmanager-0.24/debian/patches/series	2015-02-12 05:14:47.000000000 +0000
+++ cgmanager-0.24/debian/patches/series	2015-09-11 18:35:32.000000000 +0000
@@ -9,3 +9,4 @@
 0001-make-sure-to-check-cgroup-hierarchy.patch
 0009-chown-stop-cgmanager-crash-on-chown-of-bad-file.patch
 0010-Fix-subdirectory-check.patch
+0011-mount_tmpfs_onto_root.patch