From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 10 May 2024 02:36:24 +0000 (+0900)
Subject: vmspawn: fix finding systemd-journal-remote binary
X-Git-Tag: v256-rc2~52^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e8357737c649ab3f1e83d02f7c7870738ee63d5b;p=thirdparty%2Fsystemd.git

vmspawn: fix finding systemd-journal-remote binary

Follow-up for 258d26940fb6bfa1b5b8acf03cc4a37f2657e4ac.

Fixes https://github.com/systemd/systemd/pull/31218#discussion_r1596168449.
---

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index a5666459a34..4a6ef759a57 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -1923,7 +1923,15 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) {
 
         if (arg_forward_journal) {
                 _cleanup_free_ char *sd_journal_remote = NULL, *listen_address = NULL, *cred = NULL;
-                r = find_executable("systemd-journal-remote", &sd_journal_remote);
+
+                r = find_executable_full(
+                                "systemd-journal-remote",
+                                /* root = */ NULL,
+                                STRV_MAKE(LIBEXECDIR),
+                                /* use_path_envvar = */ true, /* systemd-journal-remote should be installed in
+                                                               * LIBEXECDIR, but for supporting fancy setups. */
+                                &sd_journal_remote,
+                                /* ret_fd = */ NULL);
                 if (r < 0)
                         return log_error_errno(r, "Failed to find systemd-journal-remote binary: %m");