summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-06-01 16:26:29 +0200
committerGitHub <noreply@github.com>2022-06-01 16:26:29 +0200
commit14c811ff4a3025a3ba8b969f7228c05d31eb3796 (patch)
tree7bb36aa66bd88050cbcf5021a5e4303782e16ac9 /man
parentd5254fa2f6f6d779ae04ca47a419794b02cb3b2e (diff)
parentb622d2f7898302f83458fa7863c60087c7f8048b (diff)
downloadsystemd-14c811ff4a3025a3ba8b969f7228c05d31eb3796.tar.gz
Merge pull request #23575 from keszybz/logind-wall-message-cleanup
Cleanup wall messages emitted by logind and systemctl
Diffstat (limited to 'man')
-rw-r--r--man/systemctl.xml30
1 files changed, 14 insertions, 16 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 63ea80a453..6b2798ecde 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1924,23 +1924,21 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
<term><option>--check-inhibitors=</option></term>
<listitem>
- <para>When system shutdown or sleep state is request, this option controls how to deal with
- inhibitor locks. It takes one of <literal>auto</literal>, <literal>yes</literal> or
+ <para>When system shutdown or sleep state is requested, this option controls checking of inhibitor
+ locks. It takes one of <literal>auto</literal>, <literal>yes</literal> or
<literal>no</literal>. Defaults to <literal>auto</literal>, which will behave like
- <literal>yes</literal> for interactive invocations (i.e. from a TTY) and <literal>no</literal>
- for non-interactive invocations.
- <literal>yes</literal> will let the request respect inhibitor locks.
- <literal>no</literal> will let the request ignore inhibitor locks.
- </para>
- <para>Applications can establish inhibitor locks to avoid that certain important operations
- (such as CD burning or suchlike) are interrupted by system shutdown or a sleep state. Any user may
- take these locks and privileged users may override these locks.
- If any locks are taken, shutdown and sleep state requests will normally fail (unless privileged)
- and a list of active locks is printed.
- However, if <literal>no</literal> is specified or <literal>auto</literal> is specified on a
- non-interactive requests, the established locks are ignored and not shown, and the operation
- attempted anyway, possibly requiring additional privileges.
- May be overridden by <option>--force</option>.</para>
+ <literal>yes</literal> for interactive invocations (i.e. from a TTY) and <literal>no</literal> for
+ non-interactive invocations. <literal>yes</literal> lets the request respect inhibitor locks.
+ <literal>no</literal> lets the request ignore inhibitor locks.</para>
+
+ <para>Applications can establish inhibitor locks to prevent certain important operations (such as
+ CD burning) from being interrupted by system shutdown or sleep. Any user may take these locks and
+ privileged users may override these locks. If any locks are taken, shutdown and sleep state
+ requests will normally fail (unless privileged). However, if <literal>no</literal> is specified or
+ <literal>auto</literal> is specified on a non-interactive requests, the operation will be
+ attempted. If locks are present, the operation may require additional privileges.</para>
+
+ <para>Option <option>--force</option> provides another way to override inhibitors.</para>
</listitem>
</varlistentry>