if lxc-init can't mount /dev/shm, don't fail.

The 'lxc-init' (a lightweight init process used by lxc-execute in place of upstart etc) tries to mount /dev/shm during startup. If that fails (for instance /dev/shm does not exist) then it aborts execution and returns -1. This is unreasonable as very few applications actually need /dev/shm. Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

if lxc-init can't mount /dev/shm, don't fail.
721d262c · Serge Hallyn · Daniel Lezcano · 8b004f07 · 721d262c
Commit 721d262c authored Feb 07, 2012 by Serge Hallyn Committed by Daniel Lezcano Feb 26, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -131,8 +131,9 @@ extern int lxc_setup_fs(void)
 	if (mount_fs("proc", "/proc", "proc"))
 		return -1;
+	/* if we can't mount /dev/shm, continue anyway */
 	if (mount_fs("shmfs", "/dev/shm", "tmpfs"))
-		return -1;
+		DEBUG("failed to mount /dev/shm");
 	/* If we were able to mount /dev/shm, then /dev exists */
 	/* Sure, but it's read-only per config :) */