From: Nick Rosbrook <enr0n@ubuntu.com>
Date: Wed, 10 Jun 2026 19:26:47 +0000 (-0400)
Subject: mkosi: copy packaged test-fdstore if not built locally
X-Git-Tag: v261~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3405c9da339104c197a4eb74f72384916f2d5c1e;p=thirdparty%2Fsystemd.git

mkosi: copy packaged test-fdstore if not built locally

On Ubuntu autopkgtest, TEST-91-LIVEUPDATE fails because test-fdstore is
not found in the dummy container.
---

diff --git a/mkosi/mkosi.images/minimal-base/mkosi.postinst b/mkosi/mkosi.images/minimal-base/mkosi.postinst
index ba3f4aec31d..7cb50ad97f4 100755
--- a/mkosi/mkosi.images/minimal-base/mkosi.postinst
+++ b/mkosi/mkosi.images/minimal-base/mkosi.postinst
@@ -20,4 +20,8 @@ fi
 # For use in the minimal containers, only needs libsystemd and libc
 if [[ -x "$BUILDDIR/test-fdstore" ]]; then
     cp "$BUILDDIR/test-fdstore" "$BUILDROOT/usr/bin/test-fdstore"
+elif [[ -x "$BUILDROOT/usr/lib/systemd/tests/unit-tests/manual/test-fdstore" ]]; then
+    cp "$BUILDROOT/usr/lib/systemd/tests/unit-tests/manual/test-fdstore" "$BUILDROOT/usr/bin/test-fdstore"
+elif [[ -x /usr/lib/systemd/tests/unit-tests/manual/test-fdstore ]]; then
+    cp /usr/lib/systemd/tests/unit-tests/manual/test-fdstore "$BUILDROOT/usr/bin/test-fdstore"
 fi