From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 22 Jun 2022 12:30:57 +0000 (+0200)
Subject: udevadm info: use pager for all output types
X-Git-Tag: v252-rc1~784^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F23806%2Fhead;p=thirdparty%2Fsystemd.git

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.
---

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);
         }