summaryrefslogtreecommitdiffstats
path: root/src/coredump
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-14 20:09:39 +0100
committerGitHub <noreply@github.com>2018-11-14 20:09:39 +0100
commit042cad5737917e6964ddddba72b8fcc0cb890877 (patch)
tree7085fa0272983217e94d5ce8f84cd5056d6ece31 /src/coredump
parentcore: drop dbus queue recursion check (diff)
parentman: use <keycombo> more (diff)
downloadsystemd-042cad5737917e6964ddddba72b8fcc0cb890877.tar.xz
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/coredump')
-rw-r--r--src/coredump/coredumpctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 49df8656b6..6160b4bf7a 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -43,7 +43,7 @@ static usec_t arg_since = USEC_INFINITY, arg_until = USEC_INFINITY;
static const char* arg_field = NULL;
static const char *arg_debugger = NULL;
static const char *arg_directory = NULL;
-static bool arg_no_pager = false;
+static PagerFlags arg_pager_flags = 0;
static int arg_no_legend = false;
static int arg_one = false;
static FILE* arg_output = NULL;
@@ -211,7 +211,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:
@@ -659,7 +659,7 @@ static int dump_list(int argc, char **argv, void *userdata) {
if (r < 0)
return r;
- (void) pager_open(arg_no_pager, false);
+ (void) pager_open(arg_pager_flags);
/* The coredumps are likely to compressed, and for just
* listing them we don't need to decompress them, so let's