diff options
| -rw-r--r-- | man/systemd-inhibit.xml | 3 | ||||
| -rw-r--r-- | src/login/inhibit.c | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index a3fdcebe2b..6167fb3592 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -131,6 +131,7 @@ acquiring one.</para></listitem> </varlistentry> + <xi:include href="standard-options.xml" xpointer="no-pager" /> <xi:include href="standard-options.xml" xpointer="help" /> <xi:include href="standard-options.xml" xpointer="version" /> </variablelist> @@ -155,6 +156,8 @@ doing so.</para> </refsect1> + <xi:include href="less-variables.xml" /> + <refsect1> <title>See Also</title> <para> diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 5fa3e8d960..75f5e4d30e 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -18,6 +18,7 @@ #include "bus-util.h" #include "fd-util.h" #include "format-util.h" +#include "pager.h" #include "process-util.h" #include "signal-util.h" #include "strv.h" @@ -28,6 +29,7 @@ static const char* arg_what = "idle:sleep:shutdown"; static const char* arg_who = NULL; static const char* arg_why = "Unknown reason"; static const char* arg_mode = NULL; +static bool arg_no_pager = false; static enum { ACTION_INHIBIT, @@ -69,6 +71,8 @@ static int print_inhibitors(sd_bus *bus, sd_bus_error *error) { unsigned n = 0; int r; + (void) pager_open(arg_no_pager, false); + r = sd_bus_call_method( bus, "org.freedesktop.login1", @@ -121,6 +125,7 @@ static void help(void) { "Execute a process while inhibiting shutdown/sleep/idle.\n\n" " -h --help Show this help\n" " --version Show package version\n" + " --no-pager Do not pipe output into a pager\n" " --what=WHAT Operations to inhibit, colon separated list of:\n" " shutdown, sleep, idle, handle-power-key,\n" " handle-suspend-key, handle-hibernate-key,\n" @@ -141,6 +146,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_WHY, ARG_MODE, ARG_LIST, + ARG_NO_PAGER, }; static const struct option options[] = { @@ -151,6 +157,7 @@ static int parse_argv(int argc, char *argv[]) { { "why", required_argument, NULL, ARG_WHY }, { "mode", required_argument, NULL, ARG_MODE }, { "list", no_argument, NULL, ARG_LIST }, + { "no-pager", no_argument, NULL, ARG_NO_PAGER }, {} }; @@ -190,6 +197,10 @@ static int parse_argv(int argc, char *argv[]) { arg_action = ACTION_LIST; break; + case ARG_NO_PAGER: + arg_no_pager = true; + break; + case '?': return -EINVAL; @@ -231,6 +242,7 @@ int main(int argc, char *argv[]) { if (arg_action == ACTION_LIST) { r = print_inhibitors(bus, &error); + pager_close(); if (r < 0) { log_error("Failed to list inhibitors: %s", bus_error_message(&error, -r)); return EXIT_FAILURE; |