aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerge E. Hallyn <serge.hallyn@canonical.com>2011-10-24 14:38:30 +0200
committerDaniel Lezcano <daniel.lezcano@free.fr>2011-10-24 14:38:30 +0200
commitb91b1cd79c1857a8aa5f329415cb23175b959cc1 (patch)
tree975da96dee2d66134bbaba958ce3859511d001d1
parentubuntu template: disallow cap_sys_module (by popular demand) (diff)
downloadlxc-b91b1cd79c1857a8aa5f329415cb23175b959cc1.tar.gz
lxc-b91b1cd79c1857a8aa5f329415cb23175b959cc1.tar.bz2
lxc-b91b1cd79c1857a8aa5f329415cb23175b959cc1.zip
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>
-rw-r--r--src/lxc/utils.c5
-rw-r--r--templates/lxc-sshd.in1
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 6279d77..4647bd4 100644
--- 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'");
- return -1;
+ DEBUG("failed to create '/dev/mqueue'");
+ return 0;
}
if (mount_fs("mqueue", "/dev/mqueue", "mqueue"))
diff --git a/templates/lxc-sshd.in b/templates/lxc-sshd.in
index 0e8346f..bd5d293 100644
--- 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 \