From: Stéphane Graber <stgraber@ubuntu.com>
Date: Sat, 16 Feb 2019 01:02:07 +0000 (-0500)
Subject: mount: Allow over-mounting
X-Git-Tag: lxc-3.2.0~146^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c00d0e3b2a06b34ebe25c27208ab38075bbf33d2;p=thirdparty%2Flxc.git

mount: Allow over-mounting

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 9875a58a3..667674ba0 100644
--- 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)