Merge pull request #2859 from stgraber/master

mount: Allow over-mounting
lxc · Feb 16, 2019 · eba282e · eba282e
2 parents 4d3d037 + c00d0e3
commit eba282e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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)