forked from pool/systemd
28 lines
950 B
Diff
28 lines
950 B
Diff
|
From 4bed248505da4da94d82078fe60326a374970e97 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Fri, 26 Sep 2014 10:49:55 -0400
|
||
|
|
Subject: [PATCH] journalctl: do not output --reboot-- markers when running
|
||
|
|
non-interactively
|
||
|
|
|
||
|
|
They are not legal in the export format.
|
||
|
|
---
|
||
|
|
src/journal/journalctl.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git src/journal/journalctl.c src/journal/journalctl.c
|
||
|
|
index 47206d3..89a922c 100644
|
||
|
|
--- src/journal/journalctl.c
|
||
|
|
+++ src/journal/journalctl.c
|
||
|
|
@@ -1939,7 +1939,7 @@ int main(int argc, char *argv[]) {
|
||
|
|
goto finish;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (!arg_merge) {
|
||
|
|
+ if (!arg_merge && !arg_quiet) {
|
||
|
|
sd_id128_t boot_id;
|
||
|
|
|
||
|
|
r = sd_journal_get_monotonic_usec(j, NULL, &boot_id);
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|