From a4d5848aa2907ad818a1a4b1f8133dd12703260e Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Wed, 17 Jul 2019 22:24:23 -0700 Subject: [PATCH 1/2] NEWS: bullet point for ExecCondition= --- NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 8aa40f7ddc..9ba689a3d6 100644 --- 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: From 09c73ee7fe16ffe7684afe4fe0d9f1cf3fa29419 Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Wed, 17 Jul 2019 22:39:55 -0700 Subject: [PATCH 2/2] catalog: reference ExecCondition= in unit skipped str --- catalog/systemd.catalog.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index ab55421531..db275d7c50 100644 --- 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