From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Tue, 6 Dec 2016 12:01:35 +0000 (+0100)
Subject: man: fix $SERVICE_RESULT/$EXIT_CODE/$EXIT_STATUS documentation
X-Git-Tag: v233~346^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4e26faf33a255cc26d62836ca0f59b6a1e31526;p=thirdparty%2Fsystemd.git

man: fix $SERVICE_RESULT/$EXIT_CODE/$EXIT_STATUS documentation

Note that any exit code is available through $EXIT_STATUS and not through
$EXIT_CODE. This mimics siginfo.
---

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index ab83876eba5..f27e4a5c04c 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1806,23 +1806,32 @@
           <title>Summary of possible service result variable values</title>
           <tgroup cols='3'>
             <colspec colname='result' />
-            <colspec colname='status' />
             <colspec colname='code' />
+            <colspec colname='status' />
             <thead>
               <row>
                 <entry><varname>$SERVICE_RESULT</varname></entry>
-                <entry><varname>$EXIT_STATUS</varname></entry>
                 <entry><varname>$EXIT_CODE</varname></entry>
+                <entry><varname>$EXIT_STATUS</varname></entry>
               </row>
             </thead>
 
             <tbody>
+              <row>
+                <entry morerows="1" valign="top"><literal>protocol</literal></entry>
+                <entry valign="top">not set</entry>
+                <entry>not set</entry>
+              </row>
+              <row>
+                <entry><literal>exited</literal></entry>
+                <entry><literal>0</literal></entry>
+              </row>
+
               <row>
                 <entry morerows="1" valign="top"><literal>timeout</literal></entry>
                 <entry valign="top"><literal>killed</literal></entry>
                 <entry><literal>TERM</literal>, <literal>KILL</literal></entry>
               </row>
-
               <row>
                 <entry valign="top"><literal>exited</literal></entry>
                 <entry><literal>0</literal>, <literal>1</literal>, <literal>2</literal>, <literal
diff --git a/src/core/service.h b/src/core/service.h
index e09722a952f..ff9cfaeb88e 100644
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -79,6 +79,8 @@ typedef enum NotifyState {
         _NOTIFY_STATE_INVALID = -1
 } NotifyState;
 
+/* The values of this enum are referenced in man/systemd.exec.xml and src/shared/bus-unit-util.c.
+ * Update those sources for each change to this enum. */
 typedef enum ServiceResult {
         SERVICE_SUCCESS,
         SERVICE_FAILURE_RESOURCES, /* a bit of a misnomer, just our catch-all error for errnos we didn't expect */