Merge pull request #2859 from stgraber/master

mount: Allow over-mounting

Merge pull request #2859 from stgraber/master
eba282e4 · Christian Brauner · GitHub · 4d3d037a · c00d0e3b · eba282e4
Unverified Commit eba282e4 authored Feb 16, 2019 by Christian Brauner Committed by GitHub Feb 16, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

lxccontainer.c src/lxc/lxccontainer.c +6 -4

No files found.
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -5071,10 +5071,12 @@ static int do_lxcapi_mount(struct lxc_container *c, const char *source,
 			_exit(EXIT_FAILURE);
 		}

-		ret = create_mount_target(target, sb.st_mode);
-		if (ret < 0)
-			_exit(EXIT_FAILURE);
-		TRACE("Created mount target \"%s\"", target);
+		if (access(target, F_OK) < 0 && errno == ENOENT) {
+			ret = create_mount_target(target, sb.st_mode);
+			if (ret < 0)
+				_exit(EXIT_FAILURE);
+			TRACE("Created mount target \"%s\"", target);
+		}

 		suff = strrchr(template, '/');
 		if (!suff)