diff options
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/cat.c | 1 | ||||
| -rw-r--r-- | src/journal/journalctl.c | 4 | ||||
| -rw-r--r-- | src/journal/journald-server.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/journal/cat.c b/src/journal/cat.c index 350b805..14d2083 100644 --- a/src/journal/cat.c +++ b/src/journal/cat.c @@ -10,6 +10,7 @@ #include "sd-journal.h" #include "alloc-util.h" +#include "env-util.h" #include "fd-util.h" #include "main-func.h" #include "parse-argument.h" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index d81d522..8cb96bd 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -336,7 +336,7 @@ static int help(void) { " -u --unit=UNIT Show logs from the specified unit\n" " --user-unit=UNIT Show logs from the specified user unit\n" " -t --identifier=STRING Show entries with the specified syslog identifier\n" - " -p --priority=RANGE Show entries with the specified priority\n" + " -p --priority=RANGE Show entries within the specified priority range\n" " --facility=FACILITY... Show entries with the specified facilities\n" " -g --grep=PATTERN Show entries with MESSAGE matching PATTERN\n" " --case-sensitive[=BOOL] Force case sensitive or insensitive matching\n" @@ -1048,7 +1048,7 @@ static int parse_argv(int argc, char *argv[]) { arg_boot_offset = 0; } - if (!!arg_directory + !!arg_file + !!arg_machine + !!arg_root + !!arg_image > 1) + if (!!arg_directory + !!arg_file + arg_file_stdin + !!arg_machine + !!arg_root + !!arg_image > 1) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Please specify at most one of -D/--directory=, --file=, -M/--machine=, --root=, --image=."); diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 77aef79..31358cd 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1016,7 +1016,7 @@ static void dispatch_message_real( IOVEC_ADD_STRING_FIELD(iovec, n, o->slice, "OBJECT_SYSTEMD_SLICE"); IOVEC_ADD_STRING_FIELD(iovec, n, o->user_slice, "OBJECT_SYSTEMD_USER_SLICE"); - IOVEC_ADD_ID128_FIELD(iovec, n, o->invocation_id, "OBJECT_SYSTEMD_INVOCATION_ID="); + IOVEC_ADD_ID128_FIELD(iovec, n, o->invocation_id, "OBJECT_SYSTEMD_INVOCATION_ID"); } assert(n <= m); |