summaryrefslogtreecommitdiff
path: root/src/execute.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-03-04 03:44:43 +0100
committerLennart Poettering <lennart@poettering.net>2011-03-04 03:44:43 +0100
commit8c7be95e5a80c4bd82d86e9640a071fd98618172 (patch)
treef9f8659f93430ed50da2c677dda705d35df24f69 /src/execute.h
parent0595f9a1c182a84581749823ef47c5f292e545f9 (diff)
execute: load environment files at time of execution, not when we load the service configuration
https://bugzilla.redhat.com/show_bug.cgi?id=661282
Diffstat (limited to 'src/execute.h')
-rw-r--r--src/execute.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/execute.h b/src/execute.h
index 3cdd2ad284..2856d2f33d 100644
--- a/src/execute.h
+++ b/src/execute.h
@@ -104,6 +104,8 @@ struct ExecCommand {
struct ExecContext {
char **environment;
+ char **environment_files;
+
struct rlimit *rlimit[RLIMIT_NLIMITS];
char *working_directory, *root_directory;
@@ -203,6 +205,8 @@ void exec_context_init(ExecContext *c);
void exec_context_done(ExecContext *c);
void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
+int exec_context_load_environment(const ExecContext *c, char ***l);
+
void exec_status_start(ExecStatus *s, pid_t pid);
void exec_status_exit(ExecStatus *s, pid_t pid, int code, int status, const char *utmp_id);
void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix);