projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8054d74
)
nspawn: make sure --link-journal=host may be used twice in a row
author
Lennart Poettering
<lennart@poettering.net>
Thu, 28 Jan 2016 19:24:28 +0000
(20:24 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 28 Jan 2016 19:24:28 +0000
(20:24 +0100)
Fixes #2186
This fixes fall-out from
574edc90066c3faeadcf4666928ed9b0ac409c75
.
src/nspawn/nspawn.c
patch
|
blob
|
history
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index
44c91de
..
9dd4c05
100644
(file)
--- a/
src/nspawn/nspawn.c
+++ b/
src/nspawn/nspawn.c
@@
-1457,8
+1457,8
@@
static int setup_journal(const char *directory) {
if (arg_link_journal == LINK_HOST) {
/* don't create parents here -- if the host doesn't have
* permanent journal set up, don't force it here */
- r = mkdir(p, 0755);
- if (
r < 0
) {
+
+ if (
mkdir(p, 0755) < 0 && errno != EEXIST
) {
if (try) {
log_debug_errno(errno, "Failed to create %s, skipping journal setup: %m", p);
return 0;