]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journalctl: fix --boot=0 with --file=- (from stdin)
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 26 Apr 2024 00:40:26 +0000 (09:40 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 10 May 2024 02:43:57 +0000 (11:43 +0900)
Follow-up for 592855c3189549fed93b1060b72299910c6ab1d0.

src/journal/journalctl-util.c

index 5c94e2c5ab7730237d7dab04bbc6d116d691de80..2e7e652fba78d13aa03770b72db5d4154565e541 100644 (file)
@@ -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",