From: Chris Down <chris@chrisdown.name>
Date: Fri, 21 Nov 2025 15:42:23 +0000 (+0800)
Subject: nspawn: Fix broken host links for container journals (#39727)
X-Git-Tag: v259-rc2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1ae5e26c4d208f5fe2a090b3ab43a9a38d354c8;p=thirdparty%2Fsystemd.git

nspawn: Fix broken host links for container journals (#39727)

Commit 88252ca changed nspawn to always run from a temporary mount
directory (e.g., /tmp/nspawn-root-XXXXXX). This was a good
simplification for mount logic, but it unintentionally broke the
--link-journal feature.

The setup_journal() helper was subsequently passed this ephemeral path
instead of the persistent machine path (from --directory= or --image=).
This caused the host to create broken symlinks pointing to a temporary
directory that would soon be gone.

Fix this by storing the original path and plumbing it through to
setup_journal().

All other mount-related logic in outer_child() continues to use the
temporary `directory` variable.

Fixes: #39472
---

d1ae5e26c4d208f5fe2a090b3ab43a9a38d354c8