From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Sep 2023 16:20:41 +0000 (+0200)
Subject: repart: disable pager in --dry-run=no mode
X-Git-Tag: v255-rc1~319^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c05395e82448bdf92079e1d04507ea9af6ed41b;p=thirdparty%2Fsystemd.git

repart: disable pager in --dry-run=no mode

When --dry-run=yes is used it makes sense to spawn a pager to look at
the report it provides you with about what it is about to do. Hoewver,
when we are actually doing it, then the output is more in the category
of "logs" than "review material", and logs we generally don't page when
we generate them.
---

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 9f9acdff1ed..9b564444048 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -6806,6 +6806,10 @@ static int parse_argv(int argc, char *argv[]) {
         else if (dry_run >= 0)
                 arg_dry_run = dry_run;
 
+        /* Disable pager once we are not just reviewing, but doing things. */
+        if (!arg_dry_run)
+                arg_pager_flags |= PAGER_DISABLE;
+
         if (arg_empty == EMPTY_CREATE && (arg_size == UINT64_MAX && !arg_size_auto))
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "If --empty=create is specified, --size= must be specified, too.");