nspawn: make sure --link-journal=host may be used twice in a row

Fixes #2186

This fixes fall-out from 574edc90066c3faeadcf4666928ed9b0ac409c75.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 44c91de85fc2f740af51c7e7410e278c94241a89..9dd4c051b2a40873b53785ebd39f0be12a121fae 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1457,8 +1457,8 @@ static int setup_journal(const char *directory) {
         if (arg_link_journal == LINK_HOST) {
                 /* don't create parents here -- if the host doesn't have
                  * permanent journal set up, don't force it here */
-                r = mkdir(p, 0755);
-                if (r < 0) {
+
+                if (mkdir(p, 0755) < 0 && errno != EEXIST) {
                         if (try) {
                                 log_debug_errno(errno, "Failed to create %s, skipping journal setup: %m", p);
                                 return 0;