From 959718c62107c11f1665f813e856a0a1d5b0bb7c Mon Sep 17 00:00:00 2001 From: tblume Date: Tue, 26 Apr 2016 17:10:36 +0200 Subject: core: set start job timeout from the kernel commandline (#3112) Add the boot parameter: systemd.default_timeout_start_sec to allow modification of the default start job timeout at boot time. --- man/kernel-command-line.xml | 9 +++++++++ src/core/main.c | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml index 42d5e006bb..9c04849f66 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -321,6 +321,15 @@ + + systemd.default_timeout_start_sec= + + + Overwrites the default start job timeout DefaultTimeoutStartSec= at boot. For details, + see systemd-system.conf5. + + + modules-load= rd.modules-load= diff --git a/src/core/main.c b/src/core/main.c index 8dfb3928de..75c5ff81f2 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -413,6 +413,15 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { target = runlevel_to_target(key); if (target) return free_and_strdup(&arg_default_unit, target); + + } else if (streq(key, "systemd.default_timeout_start_sec") && value) { + + r = parse_sec(value, &arg_default_timeout_start_usec); + if (r < 0) + log_warning_errno(r, "Failed to parse default start timeout: %s, ignoring.", value); + + if (arg_default_timeout_start_usec <= 0) + arg_default_timeout_start_usec = USEC_INFINITY; } return 0; -- cgit v1.2.3-54-g00ecf