mirror of
https://github.com/clearlinux/systemd-stable.git
synced 2026-10-03 23:38:39 +00:00
nspawn: restore journal directory is empty check
This undoes part of commite6a4a517be. Instead of removing the error message about non-empty journal bind mount directories, simply downgrade the message to a warning and proceed. (cherry picked from commitcdb2b9d05a)
This commit is contained in:
committed by
Zbigniew Jędrzejewski-Szmek
parent
8113d58e81
commit
2b1f027f8e
@@ -1115,6 +1115,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);
|
||||
|
||||
Reference in New Issue
Block a user