summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-11-08 15:06:37 +0100
committerGitHub <noreply@github.com>2021-11-08 15:06:37 +0100
commite2de2d28f40ff5dded8104044792fb58cdd0afa6 (patch)
tree28111f462ae3e0ff6db56edf145e617c7708a5c3 /man
parentimplement aliasing for systemd-analyze verify (diff)
parentUse ExitType=cgroup for autostart generated services (diff)
downloadsystemd-e2de2d28f40ff5dded8104044792fb58cdd0afa6.tar.xz
systemd-e2de2d28f40ff5dded8104044792fb58cdd0afa6.zip
Merge pull request #20813 from unusual-thoughts/exittype_v2
Reintroduce ExitType
Diffstat (limited to 'man')
-rw-r--r--man/org.freedesktop.systemd1.xml6
-rw-r--r--man/systemd.service.xml25
2 files changed, 31 insertions, 0 deletions
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml
index 93f2c90280..73283de721 100644
--- a/man/org.freedesktop.systemd1.xml
+++ b/man/org.freedesktop.systemd1.xml
@@ -2304,6 +2304,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
readonly s Type = '...';
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
+ readonly s ExitType = '...';
+ @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
readonly s Restart = '...';
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
readonly s PIDFile = '...';
@@ -2898,6 +2900,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
<!--property Type is not documented!-->
+ <!--property ExitType is not documented!-->
+
<!--property Restart is not documented!-->
<!--property PIDFile is not documented!-->
@@ -3428,6 +3432,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
<variablelist class="dbus-property" generated="True" extra-ref="Type"/>
+ <variablelist class="dbus-property" generated="True" extra-ref="ExitType"/>
+
<variablelist class="dbus-property" generated="True" extra-ref="Restart"/>
<variablelist class="dbus-property" generated="True" extra-ref="PIDFile"/>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 5042066d0d..95cb0aca3d 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -256,6 +256,31 @@
</varlistentry>
<varlistentry>
+ <term><varname>ExitType=</varname></term>
+
+ <listitem>
+ <para>Specifies when the manager should consider the service to be finished. One of <option>main</option> or
+ <option>cgroup</option>:</para>
+
+ <itemizedlist>
+ <listitem><para>If set to <option>main</option> (the default), the service manager
+ will consider the unit stopped when the main process, which is determined according to the
+ <varname>Type=</varname>, exits. Consequently, it cannot be used with
+ <varname>Type=</varname><option>oneshot</option>.</para></listitem>
+
+ <listitem><para>If set to <option>cgroup</option>, the service will be considered running as long as at
+ least one process in the cgroup has not exited.</para></listitem>
+ </itemizedlist>
+
+ <para>It is generally recommended to use <varname>ExitType=</varname><option>main</option> when a service has
+ a known forking model and a main process can reliably be determined. <varname>ExitType=</varname>
+ <option>cgroup</option> is meant for applications whose forking model is not known ahead of time and which
+ might not have a specific main process. It is well suited for transient or automatically generated services,
+ such as graphical applications inside of a desktop environment.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>RemainAfterExit=</varname></term>
<listitem><para>Takes a boolean value that specifies whether