From db33214b528af9d04d552444dc96e8ccc7f03ddd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 15 Dec 2017 17:16:24 +0100 Subject: [PATCH] core: move arg_show_status fix-up into load_configuration() 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. --- src/core/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/main.c b/src/core/main.c index 06fe3726318..6d440cc13fe 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -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) { -- 2.47.3