From 5b69a7c540828098cd353a8b7e5207750e02347b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 31 May 2022 10:30:09 +0200 Subject: [PATCH] man/systemctl: improve grammar in description of --check-inhibitors --- man/systemctl.xml | 30 ++++++++++++++---------------- src/systemctl/systemctl.c | 4 ++-- 2 files changed, 16 insertions(+), 18 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 - When system shutdown or sleep state is request, this option controls how to deal with - inhibitor locks. It takes one of auto, yes or + When system shutdown or sleep state is requested, this option controls checking of inhibitor + locks. It takes one of auto, yes or no. Defaults to auto, which will behave like - yes for interactive invocations (i.e. from a TTY) and no - for non-interactive invocations. - yes will let the request respect inhibitor locks. - no will let the request ignore inhibitor locks. - - 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 no is specified or auto 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 . + yes for interactive invocations (i.e. from a TTY) and no for + non-interactive invocations. yes lets the request respect inhibitor locks. + no lets the request ignore inhibitor locks. + + 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 no is specified or + auto is specified on a non-interactive requests, the operation will be + attempted. If locks are present, the operation may require additional privileges. + + Option provides another way to override inhibitors. diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 97ec51b7d9..d1cb4b7003 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -257,8 +257,8 @@ static int systemctl_help(void) { " --show-types When showing sockets, explicitly show their type\n" " --value When showing properties, only print the value\n" " --check-inhibitors=MODE\n" - " Specify if checking inhibitors before shutting down,\n" - " sleeping or hibernating\n" + " Whether to check inhibitors before shutting down,\n" + " sleeping, or hibernating\n" " -i Shortcut for --check-inhibitors=no\n" " --kill-who=WHO Whom to send signal to\n" " -s --signal=SIGNAL Which signal to send\n" -- 2.25.1