summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-03 16:26:21 +0100
committerLennart Poettering <lennart@poettering.net>2016-02-03 16:26:21 +0100
commita92ff4003f693c0f6a8bb8be844b9c1692add71b (patch)
tree89e5bb4d28e9ef6a0d538791207413af82d18a33
parent5508e4f2180d0f2e25843d85f74a31d7b643e400 (diff)
parent3cea8e06e45fc1757de8f74da29fb5fb181db4eb (diff)
Merge pull request #2519 from msekletar/journalctl-device-log-current-boot-v2
journalctl: add match for the current boot when called with devpath (v2)
-rw-r--r--man/journalctl.xml10
-rw-r--r--src/journal/journalctl.c4
2 files changed, 12 insertions, 2 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 5af98c67cb..b281f26b45 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -91,8 +91,14 @@
paths may be specified. If a file path refers to an executable
file, this is equivalent to an <literal>_EXE=</literal> match
for the canonicalized binary path. Similarly, if a path refers
- to a device node, this is equivalent to a
- <literal>_KERNEL_DEVICE=</literal> match for the device.</para>
+ to a device node then match is added for the kernel name of the
+ device (<literal>_KERNEL_DEVICE=</literal>). Also, matches for the
+ kernel names of all the parent devices are added automatically.
+ Device node paths are not stable across reboots, therefore match
+ for the current boot id (<literal>_BOOT_ID=</literal>) is
+ always added as well. Note that only the log entries for
+ the existing device nodes maybe queried by providing path to
+ the device node.</para>
<para>Additional constraints may be added using options
<option>--boot</option>, <option>--unit=</option>, etc., to
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 38fb43970e..20f7082175 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -220,6 +220,10 @@ static int add_matches_for_device(sd_journal *j, const char *devpath) {
d = udev_device_get_parent(d);
}
+ r = add_match_this_boot(j, arg_machine);
+ if (r < 0)
+ return log_error_errno(r, "Failed to add match for the current boot: %m");
+
return 0;
}