shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

nspawn: restore journal directory is empty check

Browse Source 
This undoes part of commit e6a4a517be.

Instead of removing the error message about non-empty journal bind mount
directories, simply downgrade the message to a warning and proceed.
This commit is contained in:
Lennart Poettering 2014-05-22 15:19:46 +09:00
parent 97c52b838b
commit cdb2b9d05a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nspawn/nspawn.c
View File

@ -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);