picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: make sure --link-journal=host may be used twice in a row

Browse source 
Fixes #2186

This fixes fall-out from 574edc9006.
This commit is contained in:
Lennart Poettering 2016-01-28 20:24:28 +01:00
parent 8054d749c4
commit ba8e6c4d0e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nspawn/nspawn.c
View file

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