summaryrefslogtreecommitdiff
path: root/man/systemd-inhibit.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-09-19 15:28:55 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-19 15:28:55 +0200
commit12a1309e117972791a84f20483e981a42be0d9ac (patch)
tree8fea103ff0ba47a6fd720ae8b7d5ea972a3c9f99 /man/systemd-inhibit.xml
parentbeaafb2ea6be591882aef21fe19b88e3b2461087 (diff)
man: document new inhibitor types
Diffstat (limited to 'man/systemd-inhibit.xml')
-rw-r--r--man/systemd-inhibit.xml24
1 files changed, 15 insertions, 9 deletions
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index e19892b3f1..f3ccee3bbb 100644
--- a/man/systemd-inhibit.xml
+++ b/man/systemd-inhibit.xml
@@ -106,15 +106,17 @@
operations to inhibit:
<literal>shutdown</literal>,
<literal>sleep</literal>,
- <literal>idle</literal>, for
- inhibiting
+ <literal>idle</literal>,
+ <literal>handle-power-key</literal>,
+ <literal>handle-sleep-key</literal>,
+ <literal>handle-lid-switch</literal>,
+ for inhibiting
reboot/power-off/halt/kexec,
- suspending/hibernating, resp. the
- automatic idle detection. If omitted
- defaults to
- <literal>idle:sleep:shutdown</literal>,
- i.e. takes all possible
- locks.</para></listitem>
+ suspending/hibernating, the automatic
+ idle detection, resp. the low-level
+ handling of the power/sleep key and
+ the lid switch. If omitted defaults to
+ <literal>idle:sleep:shutdown</literal>.</para></listitem>
</varlistentry>
<varlistentry>
@@ -154,7 +156,11 @@
time elapses the lock is ignored and
the operation executed. The time limit
may be specified in
- <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
+ <citerefentry><refentrytitle>systemd-logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>. Note
+ that <literal>delay</literal> is only
+ available or <literal>sleep</literal>
+ and
+ <literal>shutdown</literal>.</para></listitem>
</varlistentry>
<varlistentry>