From: Stéphane Graber <stgraber@ubuntu.com>
Date: Mon, 2 Feb 2015 09:21:20 +0000 (+0200)
Subject: In lxc.mount.auto, skip on ENONENT
X-Git-Tag: lxc-2.0.0.beta1~365
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b88ff9a0e33e7220d0c2b7059706c492200e4c2b;p=thirdparty%2Flxc.git

In lxc.mount.auto, skip on ENONENT

This resolves the case where /proc/sysrq-trigger doesn't exist by simply
ignoring any mount failure on ENOENT. With the current mount list, this
will always result in a safe environment (typically the read-only
underlay).

Closes #425

v2: Don't always show an error

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index dc497e72b..286870861 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -800,7 +800,11 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha
 					default_mounts[i].flags);
 			r = mount(source, destination, default_mounts[i].fstype, mflags, default_mounts[i].options);
 			saved_errno = errno;
-			if (r < 0)
+			if (r < 0 && errno == ENOENT) {
+				INFO("Mount source or target for %s on %s doesn't exist. Skipping.", source, destination);
+				r = 0;
+			}
+			else if (r < 0)
 				SYSERROR("error mounting %s on %s flags %lu", source, destination, mflags);
 
 			free(source);