diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-07-04 16:59:46 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-07-05 08:51:07 +0200 |
| commit | f7afdbbb986bed7022976612a740027697ce93ec (patch) | |
| tree | 1426fa660bcb3c4a91d69208bdb8d06597410be3 /src/login/logind.c | |
| parent | 20cca8d0627a8edc265314d700f5c4aa96ebed4e (diff) | |
Prep v232: Apply missing updates from upstream
Diffstat (limited to 'src/login/logind.c')
| -rw-r--r-- | src/login/logind.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/login/logind.c b/src/login/logind.c index 774fd69dd..2efa78c19 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -73,7 +73,7 @@ static void manager_reset_config(Manager *m) { m->idle_action = HANDLE_IGNORE; m->runtime_dir_size = physical_memory_scale(10U, 100U); /* 10% */ - m->user_tasks_max = system_tasks_max_scale(33U, 100U); /* 33% */ + m->user_tasks_max = system_tasks_max_scale(DEFAULT_USER_TASKS_MAX_PERCENTAGE, 100U); /* 33% */ m->sessions_max = 8192; m->inhibitors_max = 8192; @@ -1046,7 +1046,7 @@ static int manager_parse_config_file(Manager *m) { #if 0 /// elogind parses its own config file assert(m); - return config_parse_many(PKGSYSCONFDIR "/logind.conf", + return config_parse_many_nulstr(PKGSYSCONFDIR "/logind.conf", CONF_PATHS_NULSTR("systemd/logind.conf.d"), "Login\0", config_item_perf_lookup, logind_gperf_lookup, |