X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fsd-journal.c;h=19123544b34bd5dcd3f31f7b044bd1aea46667be;hb=37d3ab1b7e114f0fb6dfb2e7273569b42794b76a;hp=89045600942d8f6af9b9d943e0d54f7a0eb7599d;hpb=6f47ad30250cf467065a19105013321ee4973694;p=elogind.git diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 890456009..19123544b 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -1321,10 +1321,12 @@ static int add_directory(sd_journal *j, const char *prefix, const char *dirname) assert(prefix); assert(dirname); + log_debug("Considering %s/%s.", prefix, dirname); + if ((j->flags & SD_JOURNAL_LOCAL_ONLY) && (sd_id128_from_string(dirname, &id) < 0 || sd_id128_get_machine(&mid) < 0 || - !sd_id128_equal(id, mid))) + !(sd_id128_equal(id, mid) || path_startswith(prefix, "/run")))) return 0; path = strjoin(prefix, "/", dirname, NULL);