From cbef829f8085abeaf237987c9ffb07b1f304ecb9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 22 Jun 2022 14:30:57 +0200 Subject: [PATCH] udevadm info: use pager for all output types Before we used the pager for --tree, but not e.g. for --export-db. I don't see any particular reason to limit this. --- src/udev/udevadm-info.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index b9af7769dad..04baed2e0c1 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -295,6 +295,8 @@ static int export_devices(void) { if (r < 0) return log_error_errno(r, "Failed to scan devices: %m"); + pager_open(arg_pager_flags); + FOREACH_DEVICE_AND_SUBSYSTEM(e, d) (void) print_record(d, NULL); @@ -815,9 +817,10 @@ int info_main(int argc, char *argv[], void *userdata) { return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "-x/--export or -P/--export-prefix cannot be used with --value"); + pager_open(arg_pager_flags); + if (strv_isempty(devices)) { assert(action == ACTION_TREE); - pager_open(arg_pager_flags); return print_tree(NULL); } -- 2.47.3