summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-05-22 15:19:46 +0900
committerLennart Poettering <lennart@poettering.net>2014-05-22 15:21:01 +0900
commitcdb2b9d05a2f3d649f47bd2ba24eb3fe30b52e92 (patch)
tree1ce77aa965a2a0dc548d70f36030ae0bbfbdf7ba /src
parent97c52b838b45aee16ed9dad5a614a027f12d89ee (diff)
nspawn: restore journal directory is empty check
This undoes part of commit e6a4a517befe559adf6d1dbbadf425c3538849c9. Instead of removing the error message about non-empty journal bind mount directories, simply downgrade the message to a warning and proceed.
Diffstat (limited to 'src')
-rw-r--r--src/nspawn/nspawn.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index ef84664dfe..eb9c5e0d6c 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1143,6 +1143,9 @@ static int setup_journal(const char *directory) {
} else if (access(p, F_OK) < 0)
return 0;
+ if (dir_is_empty(q) == 0)
+ log_warning("%s is not empty, proceeding anyway.", q);
+
r = mkdir_p(q, 0755);
if (r < 0) {
log_error("Failed to create %s: %m", q);