From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 17 Jan 2012 14:21:40 +0000 (+0100)
Subject: journalctl: properly honour -n when -f is passed, too
X-Git-Tag: v39~33
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=62f21ec91ad8e7e24079962f4df066b0094fe68d

journalctl: properly honour -n when -f is passed, too
---

diff --git a/TODO b/TODO
index ba510d223..e2a19adef 100644
--- a/TODO
+++ b/TODO
@@ -21,6 +21,14 @@ Bugfixes:
 
 Features:
 
+* systemctl journal command
+
+* journalctl: --cursor support, priority filtering
+
+* systemctl status: show coredumps
+
+* systemctl status: show whether journal was rotated since service started
+
 * save coredump in Windows/Mozilla minidump format
 
 * support crash reporting operation modes (https://live.gnome.org/GnomeOS/Design/Whiteboards/ProblemReporting)
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 4d9864729..52db7a936 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -152,7 +152,7 @@ static int parse_argv(int argc, char *argv[]) {
                 }
         }
 
-        if (arg_follow && !arg_no_tail)
+        if (arg_follow && !arg_no_tail && arg_lines < 0)
                 arg_lines = 10;
 
         return 1;