34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From 37e8b3a312e64886c6fb1401c741dee7c8c102f4 Mon Sep 17 00:00:00 2001
|
|
From: Luca Boccassi <luca.boccassi@microsoft.com>
|
|
Date: Fri, 28 Jan 2022 22:56:10 +0000
|
|
Subject: [PATCH] core: don't fail on EEXIST when creating mount point
|
|
|
|
systemd[1016]: Failed to mount /tmp/app1 (type n/a) on /run/systemd/unit-extensions/1 (MS_BIND ): No such file or directory
|
|
systemd[1016]: Failed to create destination mount point node '/run/systemd/unit-extensions/1': File exists
|
|
|
|
(cherry picked from commit 9d6d4c305ab8d65aab7f546450d7331f760b7259)
|
|
(cherry picked from commit ae8bc570a81e1286eb5b59a77ef179a500b95f9d)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd/commit/37e8b3a312e64886c6fb1401c741dee7c8c102f4
|
|
---
|
|
src/core/namespace.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/namespace.c b/src/core/namespace.c
|
|
index a6c6963bb7..19942d912f 100644
|
|
--- a/src/core/namespace.c
|
|
+++ b/src/core/namespace.c
|
|
@@ -1380,7 +1380,7 @@ static int apply_one_mount(
|
|
(void) mkdir_parents(mount_entry_path(m), 0755);
|
|
|
|
q = make_mount_point_inode_from_path(what, mount_entry_path(m), 0755);
|
|
- if (q < 0)
|
|
+ if (q < 0 && q != -EEXIST)
|
|
log_error_errno(q, "Failed to create destination mount point node '%s': %m",
|
|
mount_entry_path(m));
|
|
else
|
|
--
|
|
2.33.0
|
|
|