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 exist on the host, and can't be created by the container. But we don't really need it so ignore that. Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

Let sshd template work on ubuntu systems.
b91b1cd7 · Serge E. Hallyn · Daniel Lezcano · cdcee3c7 · b91b1cd7 · b91b1cd7
Commit b91b1cd7 authored Oct 24, 2011 by Serge E. Hallyn Committed by Daniel Lezcano Oct 24, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

utils.c src/lxc/utils.c +3 -2

lxc-sshd.in templates/lxc-sshd.in +1 -0

No files found.
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -135,9 +135,10 @@ extern int lxc_setup_fs(void)
 		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'");
+		DEBUG("failed to create '/dev/mqueue'");
-		return -1;
+		return 0;
 	}
 	if (mount_fs("mqueue", "/dev/mqueue", "mqueue"))

--- a/templates/lxc-sshd.in
+++ b/templates/lxc-sshd.in
@@ -30,6 +30,7 @@ $rootfs/var/empty/sshd \
 $rootfs/var/lib/empty/sshd \
 $rootfs/etc/ssh \
 $rootfs/dev/shm \
+$rootfs/run/shm \
 $rootfs/proc \
 $rootfs/bin \
 $rootfs/sbin \