summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-06-28 16:12:47 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-06-28 16:19:59 -0400
commit592855c3189549fed93b1060b72299910c6ab1d0 (patch)
treed6100b14bde2b8d4817ade3a9f697d798f94efe4 /src/journal
parent07ff6b0823adc82bead4e73a9c3659ed1bab9801 (diff)
journalct: allow --boot=0 to DTRT with --file/--directory
--boot=0 magically meant "this boot", but when used with --file/--directory it should simply refer to the last boot found in the specified journal. This way, --boot and --list-boots are consistent. Fixes #3603.
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journalctl.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 8c59bacc0b..4cc0c2b6c2 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1121,7 +1121,7 @@ static int get_boots(
/* Adjust for the asymmetry that offset 0 is
* the last (and current) boot, while 1 is considered the
* (chronological) first boot in the journal. */
- skip_once = boot_id && sd_id128_is_null(*boot_id) && offset < 0;
+ skip_once = boot_id && sd_id128_is_null(*boot_id) && offset <= 0;
/* Advance to the earliest/latest occurrence of our reference
* boot ID (taking our lookup direction into account), so that
@@ -1263,7 +1263,12 @@ static int add_boot(sd_journal *j) {
if (!arg_boot)
return 0;
- if (arg_boot_offset == 0 && sd_id128_equal(arg_boot_id, SD_ID128_NULL))
+ /* Take a shortcut and use the current boot_id, which we can do very quickly.
+ * We can do this only when we logs are coming from the current machine,
+ * so take the slow path if log location is specified. */
+ if (arg_boot_offset == 0 && sd_id128_equal(arg_boot_id, SD_ID128_NULL) &&
+ !arg_directory && !arg_file)
+
return add_match_this_boot(j, arg_machine);
boot_id = arg_boot_id;