diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-10-22 23:16:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 23:16:11 -0400 |
| commit | 7d78f7cea82dc7b4ced77f86a05124add2509390 (patch) | |
| tree | b0086c9c7ae73a86bcb619d27dc651c04aaa50f9 /man | |
| parent | 94fce754b1248e4f174054b184e1078a593e1941 (diff) | |
| parent | ae8c7939df962cbf660b2b9517fe46be272f58b9 (diff) | |
Merge pull request #4428 from lnykryn/ctrl_v2
rename failure-action to emergency-action and use it for ctrl+alt+del burst
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 1d995f143e..80cad7f09c 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -110,8 +110,9 @@ <listitem><para>Defines what action will be performed if user presses Ctrl-Alt-Delete more than 7 times in 2s. - Can be set to <literal>reboot-force</literal>, <literal>poweroff-force</literal> - or disabled with <literal>ignore</literal>. Defaults to + Can be set to <literal>reboot-force</literal>, <literal>poweroff-force</literal>, + <literal>reboot-immediate</literal>, <literal>poweroff-immediate</literal> + or disabled with <literal>none</literal>. Defaults to <literal>reboot-force</literal>. </para></listitem> </varlistentry> |