From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 5 Sep 2012 23:52:46 +0000 (-0700)
Subject: journalctl: show "Reboot" markers in output only when showing local-only entries
X-Git-Tag: v190~162
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=cd931c0a464da9d0555e6a8e83c1aba176c0971b;hp=9e8a535faa370bab283cb2c3c52b0a0d44e9d193;p=elogind.git

journalctl: show "Reboot" markers in output only when showing local-only entries
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 73e8cb880..1a6464d5e 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -823,7 +823,6 @@ int main(int argc, char *argv[]) {
 
         for (;;) {
                 for (;;) {
-                        sd_id128_t boot_id;
                         int flags =
                                 arg_show_all * OUTPUT_SHOW_ALL |
                                 have_pager * OUTPUT_FULL_WIDTH |
@@ -840,14 +839,18 @@ int main(int argc, char *argv[]) {
                         if (r == 0)
                                 break;
 
-                        r = sd_journal_get_monotonic_usec(j, NULL, &boot_id);
-                        if (r >= 0) {
-                                if (previous_boot_id_valid &&
-                                    !sd_id128_equal(boot_id, previous_boot_id))
-                                        printf(ANSI_HIGHLIGHT_ON "----- Reboot -----" ANSI_HIGHLIGHT_OFF "\n");
+                        if (!arg_merge) {
+                                sd_id128_t boot_id;
 
-                                previous_boot_id = boot_id;
-                                previous_boot_id_valid = true;
+                                r = sd_journal_get_monotonic_usec(j, NULL, &boot_id);
+                                if (r >= 0) {
+                                        if (previous_boot_id_valid &&
+                                            !sd_id128_equal(boot_id, previous_boot_id))
+                                                printf(ANSI_HIGHLIGHT_ON "----- Reboot -----" ANSI_HIGHLIGHT_OFF "\n");
+
+                                        previous_boot_id = boot_id;
+                                        previous_boot_id_valid = true;
+                                }
                         }
 
                         line ++;