diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-22 16:59:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-22 18:10:31 +0200 |
| commit | f07756bfe25c64119704c93a634162d6c88b5c89 (patch) | |
| tree | 56478a2737270497ecb199d63804823967ac5a97 /man | |
| parent | c4147df156835513c43260a14fc9f7af177f737f (diff) | |
core: introduce "poweroff" as new failure action types
Also, change the default action on a system start-up timeout to powering off.
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 2 | ||||
| -rw-r--r-- | man/systemd.service.xml | 31 |
2 files changed, 21 insertions, 12 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 48690024f4..1fad1dba80 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -298,7 +298,7 @@ setting, see <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details. Defaults to - <option>reboot-force</option>. <varname>StartTimeoutRebootArgument=</varname> + <option>poweroff-force</option>. <varname>StartTimeoutRebootArgument=</varname> configures an optional reboot string to pass to the <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 20d2a0d755..8b17f857ce 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -1131,26 +1131,35 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting> hit. Takes one of <option>none</option>, <option>reboot</option>, - <option>reboot-force</option>, or - <option>reboot-immediate</option>. If - <option>none</option> is set, - hitting the rate limit will trigger no - action besides that the start will not - be permitted. <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, hitting + the rate limit will trigger no action + besides that the start will not be + permitted. <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 + <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. Defaults to + data loss. Similar, + <option>poweroff</option>, + <option>poweroff-force</option>, + <option>poweroff-immediate</option> + have the effect of powering down the + system with similar + semantics. Defaults to <option>none</option>.</para></listitem> </varlistentry> |