From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 4 May 2023 01:09:37 +0000 (+0900)
Subject: journalctl: fix --no-tail handling
X-Git-Tag: v254-rc1~337^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f2203f64df1d71564acd8b878906254f2a76c35;p=thirdparty%2Fsystemd.git

journalctl: fix --no-tail handling

Fixes a bug introduced by 62f21ec91ad8e7e24079962f4df066b0094fe68d.
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index b59791d437a..35fb2d275fc 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1047,7 +1047,10 @@ static int parse_argv(int argc, char *argv[]) {
                         assert_not_reached();
                 }
 
-        if (arg_follow && !arg_no_tail && !arg_since_set && arg_lines == ARG_LINES_DEFAULT)
+        if (arg_no_tail)
+                arg_lines = ARG_LINES_ALL;
+
+        if (arg_follow && !arg_since_set && arg_lines == ARG_LINES_DEFAULT)
                 arg_lines = 10;
 
         if (arg_follow && !arg_merge && !arg_boot) {