From c8c29ebbf867e507405247eb62e82b8b9cfa60bc Mon Sep 17 00:00:00 2001

From: Adam Williamson <awilliam@redhat.com>

Date: Tue, 6 Feb 2024 15:19:02 -0800

Subject: [PATCH] Resolve symlinks in ostree install bind mount destinations

 (#2262892)

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

 .../modules/payloads/payload/rpm_ostree/installation.py       | 4 ++++

 1 file changed, 4 insertions(+)

diff --git a/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py b/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py

index 1c8af4d93f..0ac8583b78 100644

--- a/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py

+++ b/pyanaconda/modules/payloads/payload/rpm_ostree/installation.py

@@ -160,6 +160,10 @@ class PrepareOSTreeMountTargetsTask(Task):

         # Canonicalize dest to the full path

         dest = self._sysroot + dest

+        # Resolve symlinks as bind mounting over symlinks does not

+        # seem to work on btrfs:

+        # https://bugzilla.redhat.com/show_bug.cgi?id=2262892

+        dest = os.path.realpath(dest)

         if bind_ro:

             safe_exec_with_redirect("mount", ["--bind", src, src])

-- 

2.43.0