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

diff --git a/TODO b/TODO
index ba510d2239db98ef1f317fc9bbd2e0128b7aead3..e2a19adef5d6ff0726be9417d0c089607f000f4a 100644 (file)
--- 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 4d9864729b2a9b0516bbd411955e86ff6b3adfd1..52db7a9365185adfd94475f8342c444f1bd0c533 100644 (file)
--- 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;