core: define "exit" and "exit-force" actions for user units and only accept that

We would accept e.g. FailureAction=reboot-force in user units and then do an
exit in the user manager. Let's be stricter, and define "exit"/"exit-force" as
the only supported actions in user units.

v2:
- rename 'exit' to 'exit-force' and add new 'exit'
- add test for the parsing function

1 files changed, 16 insertions, 10 deletions

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 4574da13a9..9f65394b06 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -868,18 +868,24 @@
         <term><varname>FailureAction=</varname></term>
         <term><varname>SuccessAction=</varname></term>
 
-        <listitem><para>Configure the action to take when the unit stops and enters a failed state or inactive
-        state. Takes one of <option>none</option>, <option>reboot</option>, <option>reboot-force</option>,
-        <option>reboot-immediate</option>, <option>poweroff</option>, <option>poweroff-force</option> or
-        <option>poweroff-immediate</option>. If <option>none</option> is set, no action will be triggered.
-        <option>reboot</option> causes a reboot following the normal shutdown procedure (i.e. equivalent to
-        <command>systemctl reboot</command>). <option>reboot-force</option> causes a forced reboot which will
-        terminate all processes forcibly but should cause no dirty file systems on reboot (i.e. equivalent to
-        <command>systemctl reboot -f</command>) and <option>reboot-immediate</option> causes immediate execution of the
+        <listitem><para>Configure the action to take when the unit stops and enters a failed state or inactive state.
+        Takes one of <option>none</option>, <option>reboot</option>, <option>reboot-force</option>,
+        <option>reboot-immediate</option>, <option>poweroff</option>, <option>poweroff-force</option>,
+        <option>poweroff-immediate</option>, <option>exit</option>, and <option>exit-force</option>. In system mode,
+        all options except <option>exit</option> and <option>exit-force</option> are allowed. In user mode, only
+        <option>none</option>, <option>exit</option>, and <option>exit-force</option> are allowed. Both options default
+        to <option>none</option>.</para>
+
+        <para>If <option>none</option> is set, no action will be triggered. <option>reboot</option> causes a reboot
+        following the normal shutdown procedure (i.e. equivalent to <command>systemctl reboot</command>).
+        <option>reboot-force</option> causes a forced reboot which will terminate all processes forcibly but should
+        cause no dirty file systems on reboot (i.e. equivalent to <command>systemctl reboot -f</command>) and
+        <option>reboot-immediate</option> causes immediate execution of the
         <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry> system call, which
         might result in data loss. Similarly, <option>poweroff</option>, <option>poweroff-force</option>,
-        <option>poweroff-immediate</option> have the effect of powering down the system with similar semantics. Both
-        options default to <option>none</option>.</para></listitem>
+        <option>poweroff-immediate</option> have the effect of powering down the system with similar
+        semantics. <option>exit</option> causes the user manager to exit following the normal shutdown procedure, and
+        <option>exit-force</option> causes it terminate without shutting down services.</para></listitem>
       </varlistentry>
 
       <varlistentry>