main: let's move ACTION_RUN test into initialize_runtime()

Let's hide this check inside the function and make it easier to follow
the general control flow of main().
This commit is contained in:
Lennart Poettering
2017-12-15 20:52:28 +01:00
parent 713a88757a
commit 2d77603838
+9 -8
View File
@@ -1917,6 +1917,9 @@ static int initialize_runtime(
* - Some only apply when we first start up, but not when we reexecute
*/
if (arg_action != ACTION_RUN)
return 0;
if (arg_system) {
/* Make sure we leave a core dump without panicing the kernel. */
install_crash_handler();
@@ -2479,14 +2482,12 @@ int main(int argc, char *argv[]) {
log_execution_mode(&first_boot);
if (arg_action == ACTION_RUN) {
r = initialize_runtime(skip_setup,
&saved_rlimit_nofile,
&saved_rlimit_memlock,
&error_message);
if (r < 0)
goto finish;
}
r = initialize_runtime(skip_setup,
&saved_rlimit_nofile,
&saved_rlimit_memlock,
&error_message);
if (r < 0)
goto finish;
r = manager_new(arg_system ? UNIT_FILE_SYSTEM : UNIT_FILE_USER,
arg_action == ACTION_TEST ? MANAGER_TEST_FULL : 0,