SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

environment: append unit_id to error messages regarding EnvironmentFile

Browse Source
This commit is contained in:
Lukas Nykryn
2014-10-17 16:05:57 +02:00
parent c7e4a7bece
commit 7491ccf2cb
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/execute.c
+3 -3
View File
@@ -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;