journal: log user units for coredumps and show them in systemctl status

1 files changed, 6 insertions, 3 deletions

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index c989be9b8..91528d3c8 100644
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -144,11 +144,14 @@ int main(int argc, char* argv[]) {
 
                 core_unit = strappend("COREDUMP_UNIT=", t);
                 free(t);
-
-                if (core_unit)
-                        IOVEC_SET_STRING(iovec[j++], core_unit);
+        } else if (cg_pid_get_user_unit(pid, &t) >= 0) {
+                core_unit = strappend("COREDUMP_USER_UNIT=", t);
+                free(t);
         }
 
+        if (core_unit)
+                IOVEC_SET_STRING(iovec[j++], core_unit);
+
         /* OK, now we know it's not the journal, hence make use of
          * it */
         log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);