diff options
| author | Franck Bui <fbui@suse.com> | 2019-10-02 11:58:16 +0200 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2020-03-09 12:41:34 +0100 |
| commit | e809564cfa5af01a26075682d49f81a987c41dd8 (patch) | |
| tree | 37d70f3c9a6e6ea93311adc2219ffa53d0cd60b4 | |
| parent | b55c9b8e717d1967e6aa16c1e2646fc81d899ab7 (diff) | |
| download | systemd-e809564cfa5af01a26075682d49f81a987c41dd8.tar.gz | |
pid1: fix DefaultTasksMax initialization
Otherwise DefaultTasksMax is always set to "inifinity".
This was broken by fb39af4ce42.
(cherry picked from commit c0000de87d2c7934cb1f4ba66a533a85277600ff)
Resolves: #1809037
| -rw-r--r-- | src/core/main.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/main.c b/src/core/main.c index d6550ea161..45d09b1e11 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2088,7 +2088,7 @@ static void reset_arguments(void) { arg_default_blockio_accounting = false; arg_default_memory_accounting = MEMORY_ACCOUNTING_DEFAULT; arg_default_tasks_accounting = true; - arg_default_tasks_max = UINT64_MAX; + arg_default_tasks_max = system_tasks_max_scale(DEFAULT_TASKS_MAX_PERCENTAGE, 100U); arg_machine_id = (sd_id128_t) {}; arg_cad_burst_action = EMERGENCY_ACTION_REBOOT_FORCE; @@ -2103,8 +2103,6 @@ static int parse_configuration(const struct rlimit *saved_rlimit_nofile, assert(saved_rlimit_nofile); assert(saved_rlimit_memlock); - arg_default_tasks_max = system_tasks_max_scale(DEFAULT_TASKS_MAX_PERCENTAGE, 100U); - /* Assign configuration defaults */ reset_arguments(); |