SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/main: get rid from excess check of ACTION_TEST (#4350)

Browse Source 
If `--test` command line option was passed, the systemd set skip_setup
to true during bootup. But after this we check again that arg_action is
test or help and opens pager depends on result.

We should skip setup in a case when `--test` is passed, but it is also
safe to set skip_setup in a case of `--help`. So let's remove first
check and move skip_setup = true to the second check.
This commit is contained in:
0xAX
2016-10-11 17:30:04 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent 8492849ee5
commit 74e7579c17
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/main.c
+3 -4
View File
@@ -1614,11 +1614,10 @@ int main(int argc, char *argv[]) {
goto finish;
}
if (arg_action == ACTION_TEST)
skip_setup = true;
if (arg_action == ACTION_TEST || arg_action == ACTION_HELP)
if (arg_action == ACTION_TEST || arg_action == ACTION_HELP) {
pager_open(arg_no_pager, false);
skip_setup = true;
}
if (arg_action == ACTION_HELP) {
retval = help();