diff -Nru lxc-0.7.5/debian/changelog lxc-0.7.5/debian/changelog
--- lxc-0.7.5/debian/changelog	2011-08-25 20:04:20.000000000 +0000
+++ lxc-0.7.5/debian/changelog	2011-09-01 17:44:44.000000000 +0000
@@ -1,3 +1,18 @@
+lxc (0.7.5-0ubuntu6) oneiric; urgency=low
+
+  * debian/rules: use --with-rootfs-path=/usr/lib/lxc/root.  (LP: #838410)
+  * debian/lxc.dirs: add usr/lib/lxc/root
+  * fix-sshd-template.patch:
+    - templates/lxc-sshd.in: add /run/shm to list of directories to create.
+      Technically /dev/shm needn't be there, as the config will overmount with
+      the host's /dev.
+    - Don't fail if we can't create /dev/mqueue.  It'll fail anyway (because
+      /dev is mounted read-only), and we don't really need it.  Without this
+      fix, lxc-init fails to run on ubuntu systems, as the host doesn't have
+      /dev/mqueue.
+
+ -- Ubuntu <ubuntu@server-639.localdomain>  Thu, 01 Sep 2011 16:01:31 +0000
+
 lxc (0.7.5-0ubuntu5) oneiric; urgency=low
 
   * Update Recommends to prefer cgroup-lite if available (LP: #829628)
diff -Nru lxc-0.7.5/debian/lxc.dirs lxc-0.7.5/debian/lxc.dirs
--- lxc-0.7.5/debian/lxc.dirs	2011-08-25 20:00:58.000000000 +0000
+++ lxc-0.7.5/debian/lxc.dirs	2011-09-01 17:44:44.000000000 +0000
@@ -5,3 +5,4 @@
 usr/share/lintian/overrides
 usr/share/doc/lxc/examples
 var/lib/lxc
+usr/lib/lxc/root
diff -Nru lxc-0.7.5/debian/patches/0005-fix-sshd-template.patch lxc-0.7.5/debian/patches/0005-fix-sshd-template.patch
--- lxc-0.7.5/debian/patches/0005-fix-sshd-template.patch	1970-01-01 00:00:00.000000000 +0000
+++ lxc-0.7.5/debian/patches/0005-fix-sshd-template.patch	2011-09-01 17:44:44.000000000 +0000
@@ -0,0 +1,37 @@
+Description: Let sshd template work on ubuntu systems.
+ /dev/shm is a symlink to /run/shm, so we need /run/shm
+ to exist in the container rootfs.  Also, /dev/mqueue does
+ not exit on the host, and can't be created by the container.
+ But we don't really need it so ignore that.
+Author: Serge Hallyn <serge.hallyn@canonical.com>
+Forwarded: no
+
+Index: lxc-0.7.5/src/lxc/utils.c
+===================================================================
+--- lxc-0.7.5.orig/src/lxc/utils.c	2011-09-01 16:23:44.760495335 +0000
++++ lxc-0.7.5/src/lxc/utils.c	2011-09-01 16:41:03.370503425 +0000
+@@ -135,9 +135,10 @@
+ 		return -1;
+ 
+ 	/* If we were able to mount /dev/shm, then /dev exists */
++	/* Sure, but it's read-only per config :) */
+ 	if (access("/dev/mqueue", F_OK) && mkdir("/dev/mqueue", 0666)) {
+-		SYSERROR("failed to create '/dev/mqueue'");
+-		return -1;
++		DEBUG("failed to create '/dev/mqueue'");
++		return 0;
+ 	}
+ 
+ 	if (mount_fs("mqueue", "/dev/mqueue", "mqueue"))
+Index: lxc-0.7.5/templates/lxc-sshd.in
+===================================================================
+--- lxc-0.7.5.orig/templates/lxc-sshd.in	2011-09-01 16:23:38.590505516 +0000
++++ lxc-0.7.5/templates/lxc-sshd.in	2011-09-01 16:25:33.900505377 +0000
+@@ -30,6 +30,7 @@
+ $rootfs/var/lib/empty/sshd \
+ $rootfs/etc/ssh \
+ $rootfs/dev/shm \
++$rootfs/run/shm \
+ $rootfs/proc \
+ $rootfs/bin \
+ $rootfs/sbin \
diff -Nru lxc-0.7.5/debian/patches/series lxc-0.7.5/debian/patches/series
--- lxc-0.7.5/debian/patches/series	2011-08-25 20:00:58.000000000 +0000
+++ lxc-0.7.5/debian/patches/series	2011-09-01 17:44:44.000000000 +0000
@@ -8,3 +8,4 @@
 0002-fix-personality-segfault.patch
 0003-non-fatal-unsupported-personality.patch
 0004-fix-ubuntu-template-only-install-essential.patch
+0005-fix-sshd-template.patch
diff -Nru lxc-0.7.5/debian/rules lxc-0.7.5/debian/rules
--- lxc-0.7.5/debian/rules	2011-08-25 20:00:58.000000000 +0000
+++ lxc-0.7.5/debian/rules	2011-09-01 17:44:57.000000000 +0000
@@ -7,7 +7,7 @@
 # Install liblxc in out private area, for now, until it's stable.
 LIBDIR="\$${prefix}/lib/lxc"
 DEB_CONFIGURE_EXTRA_FLAGS=--libdir=$(LIBDIR) \
-			  --with-rootfs-path=$(LIBDIR) \
+			  --with-rootfs-path=$(LIBDIR)/root \
 			  --enable-doc
 DEB_DH_INSTALLINIT_ARGS=--no-restart-on-upgrade