forked from pool/systemd
31 lines
1011 B
Diff
31 lines
1011 B
Diff
|
From cdb2b9d05a2f3d649f47bd2ba24eb3fe30b52e92 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Thu, 22 May 2014 15:19:46 +0900
|
||
|
|
Subject: [PATCH] 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.
|
||
|
|
---
|
||
|
|
src/nspawn/nspawn.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git src/nspawn/nspawn.c src/nspawn/nspawn.c
|
||
|
|
index ef84664..eb9c5e0 100644
|
||
|
|
--- src/nspawn/nspawn.c
|
||
|
|
+++ 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);
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|