diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-14 20:09:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 20:09:39 +0100 |
| commit | 042cad5737917e6964ddddba72b8fcc0cb890877 (patch) | |
| tree | 7085fa0272983217e94d5ce8f84cd5056d6ece31 /src/portable | |
| parent | 3dafa6bc7636451e49565f6260c531c0304285f6 (diff) | |
| parent | 84afbbcf242aef2a7ff5449be84a98e315cd4b10 (diff) | |
| download | systemd-042cad5737917e6964ddddba72b8fcc0cb890877.tar.gz | |
Merge pull request #10753 from keszybz/pager-no-interrupt
Add mode in journalctl where ^C is handled by the pager
Diffstat (limited to 'src/portable')
| -rw-r--r-- | src/portable/portablectl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c index 21e66def50..ff402151e9 100644 --- a/src/portable/portablectl.c +++ b/src/portable/portablectl.c @@ -25,7 +25,7 @@ #include "terminal-util.h" #include "verbs.h" -static bool arg_no_pager = false; +static PagerFlags arg_pager_flags = 0; static bool arg_legend = true; static bool arg_ask_password = true; static bool arg_quiet = false; @@ -263,7 +263,7 @@ static int inspect_image(int argc, char *argv[], void *userdata) { if (r < 0) return bus_log_parse_error(r); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); if (arg_cat) { printf("%s-- OS Release: --%s\n", ansi_highlight(), ansi_normal()); @@ -776,7 +776,7 @@ static int help(int argc, char *argv[], void *userdata) { _cleanup_free_ char *link = NULL; int r; - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); r = terminal_urlify_man("portablectl", "1", &link); if (r < 0) @@ -866,7 +866,7 @@ static int parse_argv(int argc, char *argv[]) { return version(); case ARG_NO_PAGER: - arg_no_pager = true; + arg_pager_flags |= PAGER_DISABLE; break; case ARG_NO_LEGEND: |