From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Tue, 29 Nov 2016 08:36:20 +0000 (+0100)
Subject: bus-util: add protocol error type explanation
X-Git-Tag: v233~375^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ed0a4c537d405544d1dd772ed08ea20143cf2d6;p=thirdparty%2Fsystemd.git

bus-util: add protocol error type explanation
---

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index abc275aad0a..ab83876eba5 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 388b3913425..3114275c85f 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" },