summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2014-10-17 11:46:01 +0200
committerLukas Nykryn <lnykryn@redhat.com>2014-10-17 16:05:57 +0200
commit7491ccf2cb237a2a88b831b2c7374ba2bb255cba (patch)
tree70731fb8bdcf9da0285b25f0bc9b64eaa4877e59 /src/core
parentc7e4a7bece7a5c4484d229dd5e8ff01a5d49c62e (diff)
environment: append unit_id to error messages regarding EnvironmentFile
Diffstat (limited to 'src/core')
-rw-r--r--src/core/execute.c6
-rw-r--r--src/core/execute.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/execute.c b/src/core/execute.c
index 4b0767aed3..f535b4778a 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;
diff --git a/src/core/execute.h b/src/core/execute.h
index 2694315155..c45dde53a6 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -241,7 +241,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
int exec_context_destroy_runtime_directory(ExecContext *c, const char *runtime_root);
-int exec_context_load_environment(const ExecContext *c, char ***l);
+int exec_context_load_environment(const ExecContext *c, const char *unit_id, char ***l);
bool exec_context_may_touch_console(ExecContext *c);