From ee232c833a604e2075703065811fd5619aad4dec Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Apr 06 2022 17:08:06 +0000 Subject: 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. --- diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml index 8bc67a1..7ac2d84 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 a1908ff..ba6d8f7 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -93,7 +93,7 @@ static PagerFlags arg_pager_flags = 0; static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; static const char *arg_host = NULL; static UnitFileScope arg_scope = UNIT_FILE_SYSTEM; -static RecursiveErrors arg_recursive_errors = RECURSIVE_ERRORS_YES; +static RecursiveErrors arg_recursive_errors = _RECURSIVE_ERRORS_INVALID; static bool arg_man = true; static bool arg_generators = false; static char *arg_root = NULL;