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>

In lxc.mount.auto, skip on ENONENT
7efe6f67 · Stéphane Graber · b1bfcca9 · 7efe6f67
Commit 7efe6f67 authored Feb 02, 2015 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

conf.c src/lxc/conf.c +5 -1

No files found.
--- 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);