[systemd-commits] src/nspawn

[Lennart Poettering]

 src/nspawn/nspawn.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cdb2b9d05a2f3d649f47bd2ba24eb3fe30b52e92
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu May 22 15:19:46 2014 +0900

    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.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index ef84664..eb9c5e0 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);