From cae7c282721ce13fc1405fc834382d3177a9b83d Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 6 Apr 2022 12:15:33 +0200 Subject: [PATCH] analyze: Fix verify exit status regression Previously, systemd-analyze verify would return 0 even if warnings were raised during analysis of the specified units or their dependencies. With 3cc3dc7, verify was changed to return 1 when warnings were raised. This commit changes the default mode to _RECURSIVE_ERRORS_INVALID so that verify returns zero again by default when warnings are raised. --- man/systemd-analyze.xml | 10 ++++++---- src/analyze/analyze.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index 7baa1794d7c..97290d479b4 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -819,10 +819,12 @@ $ systemd-analyze verify /tmp/source:alias.service Control verification of units and their dependencies and whether systemd-analyze verify exits with a non-zero process exit status or not. With yes, return a non-zero process exit status when warnings arise during verification - of either the specified unit or any of its associated dependencies. This is the default. With - no, return a non-zero process exit status when warnings arise during verification - of only the specified unit. With one, return a non-zero process exit status when - warnings arise during verification of either the specified unit or its immediate dependencies. + of either the specified unit or any of its associated dependencies. With no, + return a non-zero process exit status when warnings arise during verification of only the specified + unit. With one, return a non-zero process exit status when warnings arise during + verification of either the specified unit or its immediate dependencies. If this option is not + specified, zero is returned as the exit status regardless whether warnings arise during verification + or not. diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 905ff2c27f4..cb83e738770 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -90,7 +90,7 @@ PagerFlags arg_pager_flags = 0; BusTransport arg_transport = BUS_TRANSPORT_LOCAL; const char *arg_host = NULL; LookupScope arg_scope = LOOKUP_SCOPE_SYSTEM; -RecursiveErrors arg_recursive_errors = RECURSIVE_ERRORS_YES; +RecursiveErrors arg_recursive_errors = _RECURSIVE_ERRORS_INVALID; bool arg_man = true; bool arg_generators = false; char *arg_root = NULL; -- 2.47.3