diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-10-28 01:42:13 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-10-28 01:42:13 +0100 |
| commit | fa1b91632c5220e6589007af4cd573ca909f915a (patch) | |
| tree | 1fb3c2e97ef5d3072f7a7c56a2b7cd473d4d3498 /src/core/main.c | |
| parent | cea358fe1b600c40670da96e62c9187f0a7c2bed (diff) | |
core: remove system start timeout logic again
The system start timeout as previously implemented would get confused by
long-running services that are included in the initial system startup
transaction for example by being cron-job-like long-running services
triggered immediately at boot. Such long-running jobs would be subject
to the default 15min timeout, esily triggering it.
Hence, remove this again. In a subsequent commit, introduce per-target
job timeouts instead, that allow us to control these timeouts more
finegrained.
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/core/main.c b/src/core/main.c index 95597deaf2..a0a6ae1f0a 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -116,9 +116,6 @@ static FILE* arg_serialization = NULL; static bool arg_default_cpu_accounting = false; static bool arg_default_blockio_accounting = false; static bool arg_default_memory_accounting = false; -static usec_t arg_start_timeout_usec = DEFAULT_MANAGER_START_TIMEOUT_USEC; -static FailureAction arg_start_timeout_action = FAILURE_ACTION_POWEROFF_FORCE; -static char *arg_start_timeout_reboot_arg = NULL; static void nop_handler(int sig) {} @@ -673,9 +670,6 @@ static int parse_config_file(void) { { "Manager", "DefaultCPUAccounting", config_parse_bool, 0, &arg_default_cpu_accounting }, { "Manager", "DefaultBlockIOAccounting", config_parse_bool, 0, &arg_default_blockio_accounting }, { "Manager", "DefaultMemoryAccounting", config_parse_bool, 0, &arg_default_memory_accounting }, - { "Manager", "StartTimeoutSec", config_parse_sec, 0, &arg_start_timeout_usec }, - { "Manager", "StartTimeoutAction", config_parse_failure_action, 0, &arg_start_timeout_action }, - { "Manager", "StartTimeoutRebootArgument",config_parse_string, 0, &arg_start_timeout_reboot_arg }, {} }; @@ -1635,9 +1629,6 @@ int main(int argc, char *argv[]) { m->default_memory_accounting = arg_default_memory_accounting; m->runtime_watchdog = arg_runtime_watchdog; m->shutdown_watchdog = arg_shutdown_watchdog; - m->start_timeout_usec = arg_start_timeout_usec; - m->start_timeout_action = arg_start_timeout_action; - free_and_strdup(&m->start_timeout_reboot_arg, arg_start_timeout_reboot_arg); m->userspace_timestamp = userspace_timestamp; m->kernel_timestamp = kernel_timestamp; @@ -1827,9 +1818,6 @@ finish: set_free(arg_syscall_archs); arg_syscall_archs = NULL; - free(arg_start_timeout_reboot_arg); - arg_start_timeout_reboot_arg = NULL; - mac_selinux_finish(); if (reexecute) { |