X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=2efa78c19ff638c31f4be7d9798d9617524ca027;hb=d2dedf1570f8ab5217aec3b26bf51d1d34accbde;hp=dab6e7f443d016cf23ca42cc9879222f384e4caa;hpb=81c8750d075cba1ffd20cbd4ef18d9078b0d9f08;p=elogind.git diff --git a/src/login/logind.c b/src/login/logind.c index dab6e7f44..2efa78c19 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -42,7 +42,6 @@ #include "signal-util.h" #include "strv.h" #include "udev-util.h" - /// Additional includes needed by elogind #include "cgroup.h" // From src/core/ #include "elogind.h" @@ -74,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; @@ -1047,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,