summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2016-11-29 09:36:20 +0100
committerJouke Witteveen <j.witteveen@gmail.com>2016-11-29 23:19:52 +0100
commit7ed0a4c537d405544d1dd772ed08ea20143cf2d6 (patch)
tree9ea503863017707c6c3f79049aa621f08c5f24b6
parent3c9512c71d49d42513755cfa4329275c0360f397 (diff)
bus-util: add protocol error type explanation
-rw-r--r--man/systemd.exec.xml6
-rw-r--r--src/shared/bus-unit-util.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index abc275aad0..ab83876eba 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1772,9 +1772,9 @@
<listitem><para>Only defined for the service unit type, this environment variable is passed to all
<varname>ExecStop=</varname> and <varname>ExecStopPost=</varname> processes, and encodes the service
"result". Currently, the following values are defined: <literal>protocol</literal> (in case of a protocol
- violation; if a service did not take the steps required by its configuration), <literal>timeout</literal> (in
- case of an operation timeout), <literal>exit-code</literal> (if a service process exited with a non-zero exit
- code; see <varname>$EXIT_CODE</varname> below for the actual exit code returned), <literal>signal</literal>
+ violation; if a service did not take the steps required by its unit configuration), <literal>timeout</literal>
+ (in case of an operation timeout), <literal>exit-code</literal> (if a service process exited with a non-zero
+ exit code; see <varname>$EXIT_CODE</varname> below for the actual exit code returned), <literal>signal</literal>
(if a service process was terminated abnormally by a signal; see <varname>$EXIT_CODE</varname> below for the
actual signal used for the termination), <literal>core-dump</literal> (if a service process terminated
abnormally and dumped core), <literal>watchdog</literal> (if the watchdog keep-alive ping was enabled for the
diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 388b391342..3114275c85 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -764,6 +764,7 @@ static const struct {
const char *result, *explanation;
} explanations [] = {
{ "resources", "of unavailable resources or another system error" },
+ { "protocol", "the service did not take the steps required by its unit configuration" },
{ "timeout", "a timeout was exceeded" },
{ "exit-code", "the control process exited with error code" },
{ "signal", "a fatal signal was delivered to the control process" },