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 ba3f4aec31d425450ef0697c30f6e6ea6596b501..7cb50ad97f4e50a0d2528e1d12056d789d65b3c8 100755 (executable)
--- 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