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/locale | |
| parent | 3dafa6bc7636451e49565f6260c531c0304285f6 (diff) | |
| parent | 84afbbcf242aef2a7ff5449be84a98e315cd4b10 (diff) | |
| download | systemd-042cad5737917e6964ddddba72b8fcc0cb890877.tar.gz systemd-042cad5737917e6964ddddba72b8fcc0cb890877.tar.bz2 systemd-042cad5737917e6964ddddba72b8fcc0cb890877.zip | |
Merge pull request #10753 from keszybz/pager-no-interrupt
Add mode in journalctl where ^C is handled by the pager
Diffstat (limited to 'src/locale')
| -rw-r--r-- | src/locale/localectl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/locale/localectl.c b/src/locale/localectl.c index e2a9415138..44e3f13db8 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -24,7 +24,7 @@ #include "verbs.h" #include "virt.h" -static bool arg_no_pager = false; +static PagerFlags arg_pager_flags = 0; static bool arg_ask_password = true; static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; static char *arg_host = NULL; @@ -199,7 +199,7 @@ static int list_locales(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to read list of locales: %m"); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); strv_print(l); return 0; @@ -241,7 +241,7 @@ static int list_vconsole_keymaps(int argc, char **argv, void *userdata) { if (r < 0) return log_error_errno(r, "Failed to read list of keymaps: %m"); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); strv_print(l); @@ -373,7 +373,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { strv_sort(list); strv_uniq(list); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); strv_print(list); return 0; @@ -461,7 +461,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_NO_PAGER: - arg_no_pager = true; + arg_pager_flags |= PAGER_DISABLE; break; case ARG_NO_ASK_PASSWORD: |