From 237ecfee15988e0f059cd064dde32b00111c6388 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Mon, 28 Dec 2020 21:46:40 +0100
Subject: [PATCH] Avoid error when bind mount source already exists

---
 src/core/mount.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/mount.c b/src/core/mount.c
index 5479cf7bf2..1ad80886cd 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1010,7 +1010,9 @@ static void mount_enter_mounting(Mount *m) {
         p = get_mount_parameters_fragment(m);
         if (p && mount_is_bind(p)) {
                 r = mkdir_p_label(p->what, m->directory_mode);
-                if (r < 0)
+                /* mkdir_p_label() can return -EEXIST if the target path exists and is not a directory - which is
+                 * totally OK, in case the user wants us to overmount a non-directory inode. */
+                if (r < 0 && r != -EEXIST)
                         log_unit_error_errno(UNIT(m), r, "Failed to make bind mount source '%s': %m", p->what);
         }