diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 27 | ||||
| -rw-r--r-- | man/systemd.service.xml | 23 |
2 files changed, 38 insertions, 12 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 6105c5131c..48690024f4 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -254,7 +254,6 @@ signal.</para></listitem> </varlistentry> - <varlistentry> <term><varname>TimerSlackNSec=</varname></term> @@ -281,6 +280,32 @@ </varlistentry> <varlistentry> + <term><varname>StartTimeoutSec=</varname></term> + <term><varname>StartTimeoutAction=</varname></term> + <term><varname>StartTimeoutRebootArgument=</varname></term> + + <listitem><para>Configures an over-all + system start-up timeout and controls + what to do when the timeout is + reached. <varname>StartTimeoutSec=</varname> + specifies the timeout, and defaults to + <literal>15min</literal>. <varname>StartTimeoutAction=</varname> + configures the action to take when the + system did not finish boot-up within + the specified time. It takes the same + values as the per-service + <varname>StartLimitAction=</varname> + setting, see + <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for details. Defaults to + <option>reboot-force</option>. <varname>StartTimeoutRebootArgument=</varname> + configures an optional reboot string + to pass to the + <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry> + system call.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>DefaultTimerAccuracySec=</varname></term> <listitem><para>Sets the default diff --git a/man/systemd.service.xml b/man/systemd.service.xml index e584a1f006..20d2a0d755 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -1155,29 +1155,30 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting> </varlistentry> <varlistentry> + <term><varname>FailureAction=</varname></term> + <listitem><para>Configure the action + to take when the service enters a failed + state. Takes the same values as + <varname>StartLimitAction=</varname> + and executes the same actions. + Defaults to <option>none</option>. + </para></listitem> + </varlistentry> + + <varlistentry> <term><varname>RebootArgument=</varname></term> <listitem><para>Configure the optional argument for the <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry> system call if <varname>StartLimitAction=</varname> + or <varname>FailureAction=</varname> is a reboot action. This works just like the optional argument to <command>systemctl reboot</command> command.</para></listitem> </varlistentry> - <varlistentry> - <term><varname>FailureAction=</varname></term> - <listitem><para>Configure the action - to take when the service enters a failed - state. Takes the same values as - <varname>StartLimitAction=</varname> - and executes the same actions. - Defaults to <option>none</option>. - </para></listitem> - </varlistentry> - </variablelist> <para>Check |