nspawn: ignore EEXIST when mounting tmpfs

commit 79d80fc1466512d0ca211f4bfcd9de5f2f816a5a introduced a regression that
prevents mounting a tmpfs if the mount point already exits in the container's
root file system. This commit fixes the problem by ignoring EEXIST.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index b4dcf39e83fe924760ae307126bde8b50e448989..10a520c2db2054eaf8194bf9a74cc5ee7dd05deb 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -828,7 +828,7 @@ static int mount_tmpfs(const char *dest) {
                         return log_oom();
 
                 r = mkdir_label(where, 0755);
                         return log_oom();
 
                 r = mkdir_label(where, 0755);

-                if (r < 0) {
+                if (r < 0 && errno != EEXIST) {

                         log_error("creating mount point for tmpfs %s failed: %s", where, strerror(-r));
 
                         return r;
                         log_error("creating mount point for tmpfs %s failed: %s", where, strerror(-r));
 
                         return r;