From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 5 Dec 2018 16:33:15 +0000 (+0100)
Subject: coredump: remove duplicate MESSAGE= prefix from message
X-Git-Tag: archive/raspbian/240-4+rpi1^2~39
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8c2836f5d57047909b270c015eabd30b09b6d673;p=systemd.git

coredump: remove duplicate MESSAGE= prefix from message

systemd-coredump[9982]: MESSAGE=Process 771 (systemd-journal) of user 0 dumped core.
systemd-coredump[9982]: Coredump diverted to /var/lib/systemd/coredump/core...

log_dispatch() calls log_dispatch_internal() which calls write_to_journal()
which appends MESSAGE= on its own.

(cherry picked from commit 4f62556d71206ac814a020a954b397d4940e14c3)
(cherry picked from commit 9f564b3f45008c1a178a186f944ddc7485614cd2)

Gbp-Pq: Name coredump-remove-duplicate-MESSAGE-prefix-from-message.patch
---

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 0c888b26..20c1fb02 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -800,9 +800,10 @@ log:
                 return log_oom();
 
         if (journald_crash) {
-                /* We cannot log to the journal, so just print the MESSAGE.
+                /* We cannot log to the journal, so just print the message.
                  * The target was set previously to something safe. */
-                log_dispatch(LOG_ERR, 0, core_message);
+                assert(startswith(core_message, "MESSAGE="));
+                log_dispatch(LOG_ERR, 0, core_message + strlen("MESSAGE="));
                 return 0;
         }