From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 19 Sep 2012 13:28:55 +0000 (+0200)
Subject: man: document new inhibitor types
X-Git-Tag: v190~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=12a1309e117972791a84f20483e981a42be0d9ac;hp=beaafb2ea6be591882aef21fe19b88e3b2461087

man: document new inhibitor types
---

diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml
index e19892b3f..f3ccee3bb 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>
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index cabf1b9ce..28ce553b3 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -160,8 +160,9 @@ static int help(void) {
                "Execute a process while inhibiting shutdown/sleep/idle.\n\n"
                "  -h --help               Show this help\n"
                "     --version            Show package version\n"
-               "     --what=WHAT          Operations to inhibit, colon separated list of idle,\n"
-               "                          sleep, shutdown\n"
+               "     --what=WHAT          Operations to inhibit, colon separated list of:\n"
+               "                          shutdown, sleep, idle, handle-power-key,\n"
+               "                          handle-sleep-key, handle-lid-switch\n"
                "     --who=STRING         A descriptive string who is inhibiting\n"
                "     --why=STRING         A descriptive string why is being inhibited\n"
                "     --mode=MODE          One of block or delay\n"