From b91b1cd79c1857a8aa5f329415cb23175b959cc1 Mon Sep 17 00:00:00 2001 From: "Serge E. Hallyn" Date: Mon, 24 Oct 2011 14:38:30 +0200 Subject: [PATCH] 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 Signed-off-by: Daniel Lezcano --- src/lxc/utils.c | 5 +++-- templates/lxc-sshd.in | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lxc/utils.c b/src/lxc/utils.c index 6279d77b5..4647bd4e8 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 0e8346f90..bd5d293e8 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 \