dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 23:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: move arg_show_status fix-up into load_configuration()

Browse Source 
It's part of finalizing our runtime parameters, hence let's move this
into load_configuration() after we loaded everything else. This is safe,
since we don't use it between the location where it was and where we
place it now yet.
This commit is contained in:
Lennart Poettering
2017-12-15 17:16:24 +01:00
parent 2e51b31caf
commit db33214b52
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/main.c
View File

@@ -2095,6 +2095,10 @@ static int load_configuration(int argc, char **argv, const char **ret_error_mess
}
}
/* Initialize the show status setting if it hasn't been set explicitly yet */
if (arg_show_status == _SHOW_STATUS_UNSET)
arg_show_status = SHOW_STATUS_YES;
return 0;
}
@@ -2463,9 +2467,6 @@ int main(int argc, char *argv[]) {
log_open();
}
if (arg_show_status == _SHOW_STATUS_UNSET)
arg_show_status = SHOW_STATUS_YES;
/* Make sure we leave a core dump without panicing the
* kernel. */
if (getpid_cached() == 1) {