chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: try to reload daemon after enable/disable only when not running in a chroot
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 095fbb249c5ac65c0a6469862f898f3763ac9f8b..19123544b34bd5dcd3f31f7b044bd1aea46667be 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-958,7
+958,7
@@
_public_ int sd_journal_get_cursor(sd_journal *j, char **cursor) {
(unsigned long long) le64toh(o->entry.xor_hash)) < 0)
return -ENOMEM;
(unsigned long long) le64toh(o->entry.xor_hash)) < 0)
return -ENOMEM;
- return
1
;
+ return
0
;
}
_public_ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
}
_public_ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
@@
-1321,10
+1321,12
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
assert(prefix);
assert(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 ||
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);
return 0;
path = strjoin(prefix, "/", dirname, NULL);