X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fexecute.c;h=aad11c94aa4c6e883f1217c9229d9bb61e01c2be;hp=ab508b16186dcc9b036591c8bcb2392296ef6c30;hb=099a804b11072b6be9fd32b3aa1f90b393adef98;hpb=03bb799e0b3560dca8c9b70de3dbadb0c281b36f

diff --git a/src/core/execute.c b/src/core/execute.c
index ab508b161..aad11c94a 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1036,9 +1036,10 @@ int exec_spawn(ExecCommand *command,
                 return log_oom();
 
         log_struct_unit(LOG_DEBUG,
-                   unit_id,
-                   "MESSAGE=About to execute %s", line,
-                   NULL);
+                        unit_id,
+                        "EXECUTABLE=%s", command->path,
+                        "MESSAGE=About to execute: %s", line,
+                        NULL);
         free(line);
 
         r = cgroup_bonding_realize_list(cgroup_bondings);
@@ -1523,8 +1524,8 @@ int exec_spawn(ExecCommand *command,
                                 log_struct_unit(LOG_DEBUG,
                                                 unit_id,
                                                 "EXECUTABLE=%s", command->path,
-                                                "MESSAGE=Executing: %s",
-                                                line, NULL);
+                                                "MESSAGE=Executing: %s", line,
+                                                NULL);
                                 log_close();
                                 free(line);
                                 line = NULL;
@@ -1770,6 +1771,8 @@ int exec_context_load_environment(const ExecContext *c, char ***l) {
                                 strv_free(r);
                                 return k;
                          }
+                        /* Log invalid environment variables with filename */
+                        p = strv_env_clean_log(p, pglob.gl_pathv[n]);
 
                         if (r == NULL)
                                 r = p;