summaryrefslogtreecommitdiff
path: root/src/core/main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-04-26 20:46:20 +0200
committerLennart Poettering <lennart@poettering.net>2016-04-29 16:27:48 +0200
commitf0367da7d1a61ad698a55d17b5c28ddce0dc265a (patch)
treea6f9f585bdbdcfe5245f20e7c13806b77f2c2c9a /src/core/main.c
parent7629ec4642b03517742d09b7303c204fddf82108 (diff)
core: rename StartLimitInterval= to StartLimitIntervalSec=
We generally follow the rule that for time settings we suffix the setting name with "Sec" to indicate the default unit if none is specified. The only exception was the rate limiting interval settings. Fix this, and keep the old names for compatibility. Do the same for journald's RateLimitInterval= setting
Diffstat (limited to 'src/core/main.c')
-rw-r--r--src/core/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 9fcd3fe1bd..ed4d42c8cc 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -670,7 +670,8 @@ static int parse_config_file(void) {
{ "Manager", "DefaultTimeoutStartSec", config_parse_sec, 0, &arg_default_timeout_start_usec },
{ "Manager", "DefaultTimeoutStopSec", config_parse_sec, 0, &arg_default_timeout_stop_usec },
{ "Manager", "DefaultRestartSec", config_parse_sec, 0, &arg_default_restart_usec },
- { "Manager", "DefaultStartLimitInterval", config_parse_sec, 0, &arg_default_start_limit_interval },
+ { "Manager", "DefaultStartLimitInterval", config_parse_sec, 0, &arg_default_start_limit_interval }, /* obsolete alias */
+ { "Manager", "DefaultStartLimitIntervalSec",config_parse_sec, 0, &arg_default_start_limit_interval },
{ "Manager", "DefaultStartLimitBurst", config_parse_unsigned, 0, &arg_default_start_limit_burst },
{ "Manager", "DefaultEnvironment", config_parse_environ, 0, &arg_default_environment },
{ "Manager", "DefaultLimitCPU", config_parse_limit, RLIMIT_CPU, arg_default_rlimit },