From dd598123a9f9416c9b8fd5f4ef60b77574750941 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Tue, 13 Oct 2015 09:01:37 +0300 Subject: journalctl: open pager for --dump-catalog and --list-catalog --- src/journal/journalctl.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/journal/journalctl.c') diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index d9851db36c..3cc5b1e702 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1879,6 +1879,7 @@ int main(int argc, char *argv[]) { } else { bool oneline = arg_action == ACTION_LIST_CATALOG; + pager_open_if_enabled(); if (optind < argc) r = catalog_list_items(stdout, database, oneline, argv + optind); -- cgit v1.2.3-54-g00ecf From f98a41c21d80a5bc1dff40301faefb1b585767f2 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Tue, 13 Oct 2015 09:04:11 +0300 Subject: journalctl: enable args for --dump-catalog and --list-catalog `journalctl --dump-catalog ID1 ID2 ...` works fine. --- src/journal/journalctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/journal/journalctl.c') diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 3cc5b1e702..e163e3d417 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -748,7 +748,7 @@ static int parse_argv(int argc, char *argv[]) { return -EINVAL; } - if (arg_action != ACTION_SHOW && optind < argc) { + if (!IN_SET(arg_action, ACTION_SHOW, ACTION_DUMP_CATALOG, ACTION_LIST_CATALOG) && optind < argc) { log_error("Extraneous arguments starting with '%s'", argv[optind]); return -EINVAL; } -- cgit v1.2.3-54-g00ecf