From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 26 Apr 2024 00:40:26 +0000 (+0900)
Subject: journalctl: fix --boot=0 with --file=- (from stdin)
X-Git-Tag: v256-rc2~50^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae0e6de918b7f8cb89ed1d69a4631d02eeab7d0c;p=thirdparty%2Fsystemd.git

journalctl: fix --boot=0 with --file=- (from stdin)

Follow-up for 592855c3189549fed93b1060b72299910c6ab1d0.
---

diff --git a/src/journal/journalctl-util.c b/src/journal/journalctl-util.c
index 5c94e2c5ab7..2e7e652fba7 100644
--- a/src/journal/journalctl-util.c
+++ b/src/journal/journalctl-util.c
@@ -89,7 +89,7 @@ int journal_acquire_boot(sd_journal *j) {
          * We can do this only when the logs are coming from the current machine,
          * so take the slow path if log location is specified. */
         if (arg_boot_offset == 0 && sd_id128_is_null(arg_boot_id) &&
-            !arg_directory && !arg_file && !arg_root) {
+            !arg_directory && !arg_file && !arg_file_stdin && !arg_root) {
                 r = id128_get_boot_for_machine(arg_machine, &arg_boot_id);
                 if (r < 0)
                         return log_error_errno(r, "Failed to get boot ID%s%s: %m",