From 7491ccf2cb237a2a88b831b2c7374ba2bb255cba Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Fri, 17 Oct 2014 11:46:01 +0200 Subject: environment: append unit_id to error messages regarding EnvironmentFile --- src/core/execute.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/execute.c') diff --git a/src/core/execute.c b/src/core/execute.c index 4b0767aed..f535b4778 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1785,7 +1785,7 @@ int exec_spawn(ExecCommand *command, n_fds = params->n_fds; } - err = exec_context_load_environment(context, &files_env); + err = exec_context_load_environment(context, params->unit_id, &files_env); if (err < 0) { log_struct_unit(LOG_ERR, params->unit_id, @@ -2014,7 +2014,7 @@ void exec_command_free_array(ExecCommand **c, unsigned n) { } } -int exec_context_load_environment(const ExecContext *c, char ***l) { +int exec_context_load_environment(const ExecContext *c, const char *unit_id, char ***l) { char **i, **r = NULL; assert(c); @@ -2071,7 +2071,7 @@ int exec_context_load_environment(const ExecContext *c, char ***l) { } /* Log invalid environment variables with filename */ if (p) - p = strv_env_clean_log(p, pglob.gl_pathv[n]); + p = strv_env_clean_log(p, unit_id, pglob.gl_pathv[n]); if (r == NULL) r = p; -- cgit v1.2.3