chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
event: make sure to possibly disarm the timerfds before we reenter epoll_wait
[elogind.git]
/
man
/
systemd-inhibit.xml
diff --git
a/man/systemd-inhibit.xml
b/man/systemd-inhibit.xml
index e19892b3f10b47a27173e06e1efc9cbc9c95891e..de2f264147e4d4888e721c8ee21685181eee2902 100644
(file)
--- a/
man/systemd-inhibit.xml
+++ b/
man/systemd-inhibit.xml
@@
-101,28
+101,32
@@
<varlistentry>
<term><option>--what=</option></term>
<varlistentry>
<term><option>--what=</option></term>
- <listitem><para>Takes a colon
-
separated
list of one or more
+ <listitem><para>Takes a colon
-separated
+ list of one or more
operations to inhibit:
<literal>shutdown</literal>,
<literal>sleep</literal>,
operations to inhibit:
<literal>shutdown</literal>,
<literal>sleep</literal>,
- <literal>idle</literal>, for
- inhibiting
+ <literal>idle</literal>,
+ <literal>handle-power-key</literal>,
+ <literal>handle-suspend-key</literal>,
+ <literal>handle-hibernate-key</literal>,
+ <literal>handle-lid-switch</literal>,
+ for inhibiting
reboot/power-off/halt/kexec,
reboot/power-off/halt/kexec,
- suspending/hibernating, resp. the
- automatic idle detection. If omitted
+ suspending/hibernating, the automatic
+ idle detection, or the low-level
+ handling of the power/sleep key and
+ the lid switch, respectively. If omitted,
defaults to
defaults to
- <literal>idle:sleep:shutdown</literal>,
- i.e. takes all possible
- locks.</para></listitem>
+ <literal>idle:sleep:shutdown</literal>.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--who=</option></term>
</varlistentry>
<varlistentry>
<term><option>--who=</option></term>
- <listitem><para>Takes a short
human
- readable descriptive string for the
- program taking the lock. If not passed
+ <listitem><para>Takes a short
,
+
human-
readable descriptive string for the
+ program taking the lock. If not passed
,
defaults to the command line
string.</para></listitem>
</varlistentry>
defaults to the command line
string.</para></listitem>
</varlistentry>
@@
-130,8
+134,8
@@
<varlistentry>
<term><option>--why=</option></term>
<varlistentry>
<term><option>--why=</option></term>
- <listitem><para>Takes a short
human
- readable descriptive string for the
+ <listitem><para>Takes a short
,
+
human-
readable descriptive string for the
reason for taking the lock. Defaults
to "Unknown reason".</para></listitem>
</varlistentry>
reason for taking the lock. Defaults
to "Unknown reason".</para></listitem>
</varlistentry>
@@
-151,10
+155,14
@@
<literal>delay</literal> is used, the
lock can only delay the requested
operations for a limited time. If the
<literal>delay</literal> is used, the
lock can only delay the requested
operations for a limited time. If the
- time elapses the lock is ignored and
+ time elapses
,
the lock is ignored and
the operation executed. The time limit
may be specified in
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 for <literal>sleep</literal>
+ and
+ <literal>shutdown</literal>.</para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>