dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-09 17:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmspawn: Prefer systemd-journal-remote from $PATH

Browse Source 
$PATH might point to a systemd checkout containing
a newer version of systemd-journal-remote which we
should use, hence prefer an executable from $PATH
over the one from /usr/lib/systemd.
This commit is contained in:
Daan De Meyer
2026-05-12 13:03:49 +00:00
committed by Daan De Meyer
parent 42f2970f89
commit 408d474dfa
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/shared/fork-notify.c
View File

@@ -287,13 +287,15 @@ int fork_journal_remote(
return log_error_errno(r, "Failed to find systemd-socket-activate binary: %m");
_cleanup_free_ char *sd_journal_remote = NULL;
r = find_executable_full(
"systemd-journal-remote",
/* root= */ NULL,
STRV_MAKE(LIBEXECDIR),
/* use_path_envvar= */ true,
&sd_journal_remote,
/* ret_fd= */ NULL);
r = find_executable("systemd-journal-remote", &sd_journal_remote);
if (r == -ENOENT)
r = find_executable_full(
"systemd-journal-remote",
/* root= */ NULL,
STRV_MAKE(LIBEXECDIR),
/* use_path_envvar= */ false,
&sd_journal_remote,
/* ret_fd= */ NULL);
if (r < 0)
return log_error_errno(r, "Failed to find systemd-journal-remote binary: %m");