diff options
author | Lennart Poettering <lennart@poettering.net> | 2014-07-07 19:25:31 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2014-07-07 21:05:09 +0200 |
commit | e26807239bd65bc17535a53cd540f38600e7ef24 (patch) | |
tree | 3100aec0ebcf4743d138fcf4d6d03977b8a90817 /src/shared/util.c | |
parent | 45035609fcfc3fe09324988c4929a3c147171c23 (diff) |
firstboot: get rid of firstboot generator again, introduce ConditionFirstBoot= instead
As Zbigniew pointed out a new ConditionFirstBoot= appears like the nicer
way to hook in systemd-firstboot.service on first boots (those with /etc
unpopulated), so let's do this, and get rid of the generator again.
Diffstat (limited to 'src/shared/util.c')
-rw-r--r-- | src/shared/util.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 88511b69c0..33427981eb 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -3795,7 +3795,7 @@ bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) { return endswith(de->d_name, suffix); } -void execute_directory(const char *directory, DIR *d, usec_t timeout, char *argv[], char *env[]) { +void execute_directory(const char *directory, DIR *d, usec_t timeout, char *argv[]) { pid_t executor_pid; int r; @@ -3826,14 +3826,6 @@ void execute_directory(const char *directory, DIR *d, usec_t timeout, char *argv assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0); - if (!strv_isempty(env)) { - char **i; - - STRV_FOREACH(i, env) - putenv(*i); - } - - if (!d) { d = _d = opendir(directory); if (!d) { |