diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-03-06 02:19:06 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-03-06 04:00:42 +0100 |
| commit | aa62a8936f5983770e90b791083d55107659f7a1 (patch) | |
| tree | 6a933d09bd28e781c608b602f2281dec3f69a8a4 /src/core | |
| parent | 6a3f892a23db71544d0439355f96c44350dafa8f (diff) | |
util: add timeout to generator execution
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/manager.c | 2 | ||||
| -rw-r--r-- | src/core/shutdown.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index e4d03681ab..27a1cc6777 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2657,7 +2657,7 @@ void manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) - execute_directory(generator_path, d, (char**) argv); + execute_directory(generator_path, d, DEFAULT_TIMEOUT_USEC, (char**) argv); finish: trim_generator_dir(m, &m->generator_unit_path); diff --git a/src/core/shutdown.c b/src/core/shutdown.c index c7510304f2..7ef671ad0f 100644 --- a/src/core/shutdown.c +++ b/src/core/shutdown.c @@ -368,7 +368,7 @@ int main(int argc, char *argv[]) { arguments[0] = NULL; arguments[1] = arg_verb; arguments[2] = NULL; - execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, arguments); + execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, DEFAULT_TIMEOUT_USEC, arguments); if (!in_container && !in_initrd() && access("/run/initramfs/shutdown", X_OK) == 0) { |