From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 6 Apr 2022 10:15:33 +0000 (+0200)
Subject: analyze: Fix verify exit status regression
X-Git-Tag: v251-rc2~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cae7c282721ce13fc1405fc834382d3177a9b83d;p=thirdparty%2Fsystemd.git

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 7baa1794d7c..97290d479b4 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -819,10 +819,12 @@ $ systemd-analyze verify /tmp/source:alias.service
         <listitem><para>Control verification of units and their dependencies and whether
         <command>systemd-analyze verify</command> exits with a non-zero process exit status or not. With
         <command>yes</command>, 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
-        <command>no</command>, return a non-zero process exit status when warnings arise during verification
-        of only the specified unit. With <command>one</command>, return a non-zero process exit status when
-        warnings arise during verification of either the specified unit or its immediate dependencies. </para></listitem>
+        of either the specified unit or any of its associated dependencies. With <command>no</command>,
+        return a non-zero process exit status when warnings arise during verification of only the specified
+        unit. With <command>one</command>, 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.</para></listitem>
       </varlistentry>
 
       <varlistentry>
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;