Merge pull request #13103 from anitazha/conditiondocs

NEWS and catalog update for ExecCondition=

diff --git a/NEWS b/NEWS
index 8aa40f7ddcfaf67cd7f17f2aef189b83bb496265..9ba689a3d6a9a6d7e08010f481d68df32fb79e85 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -297,6 +297,12 @@ CHANGES WITH 243 in spe:
           takes a tty name to spawn the debug shell on, which allows selecting
           a different tty than the built-in default.
 
+        * Service units gained a new ExecCondition= setting which will run
+          before ExecStartPre= and either continue execution of the unit (for
+          clean exit codes), stop execution without marking the unit failed
+          (for exit codes 1 through 254), or stop execution and fail the unit
+          (for exit code 255 or cases of abnormal termination).
+
           …
 
 CHANGES WITH 242:

diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in
index ab554215310870342f239111a74815fc675576ce..db275d7c50188c0fb17b03a72d8e8f793a744c8d 100644 (file)
--- a/catalog/systemd.catalog.in
+++ b/catalog/systemd.catalog.in
@@ -364,7 +364,8 @@ Subject: Unit skipped
 Defined-By: systemd
 Support: %SUPPORT_URL%
 
-The unit @UNIT@ was skipped and has entered the 'dead' state with result '@UNIT_RESULT@'.
+The unit @UNIT@ was skipped due to an ExecCondition= command failure, and has
+entered the 'dead' state with result '@UNIT_RESULT@'.
 
 -- d9b373ed55a64feb8242e02dbe79a49c
 Subject: Unit failed