picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

main: move initialize_join_controllers() invocation into load_configuration()

Browse source 
This just sets up some variables the loaded configuration will then
modify. Let's invoke it hence right before loading the configuration.

This moves the initialization just a tiny bit later, but that shouldn't
matter, since we never access it in-between.
This commit is contained in:
Lennart Poettering 2017-12-15 16:48:07 +01:00
parent 51e5ff02a8
commit 6f101b566f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/main.c
View file

@ -2056,6 +2056,12 @@ static int load_configuration(int argc, char **argv, const char **ret_error_mess
assert(ret_error_message);
r = initialize_join_controllers();
if (r < 0) {
*ret_error_message = "Failed to initialize cgroup controller joining table";
return r;
}
arg_default_tasks_max = system_tasks_max_scale(DEFAULT_TASKS_MAX_PERCENTAGE, 100U);
r = parse_config_file();
@ -2352,12 +2358,6 @@ int main(int argc, char *argv[]) {
log_warning_errno(r, "Failed to redirect standard streams to /dev/null: %m");
}
r = initialize_join_controllers();
if (r < 0) {
error_message = "Failed to initialize cgroup controllers";
goto finish;
}
/* Mount /proc, /sys and friends, so that /proc/cmdline and
* /proc/$PID/fd is available. */
if (getpid_cached() == 1) {