From a0b50e4d25cffdb1e6bb289bcfe7f344969e0fc0 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Fri, 12 Jan 2024 10:27:43 +0100 Subject: [PATCH] test: use systemd-id128 from the build dir As distro sd-id128 might not have all the options we need. Follow-up for: 378712c Replaces: #30901 --- test/test-functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test-functions b/test/test-functions index 1ee41b636d3..92bb7d532ba 100644 --- a/test/test-functions +++ b/test/test-functions @@ -120,6 +120,7 @@ SYSTEMD="${SYSTEMD:-$(command -v "$BUILD_DIR/systemd" || command -v "$ROOTLIBDIR SYSTEMD_NSPAWN="${SYSTEMD_NSPAWN:-$(command -v "$BUILD_DIR/systemd-nspawn" || command -v systemd-nspawn)}" JOURNALCTL="${JOURNALCTL:-$(command -v "$BUILD_DIR/journalctl" || command -v journalctl)}" SYSTEMCTL="${SYSTEMCTL:-$(command -v "$BUILD_DIR/systemctl" || command -v systemctl)}" +SYSTEMD_ID128="${SYSTEMD_ID128:-$(command -v "$BUILD_DIR/systemd-id128" || command -v systemd-id128)}" TESTFILE="${BASH_SOURCE[1]}" if [ -z "$TESTFILE" ]; then @@ -1653,7 +1654,7 @@ create_empty_image() { sfdisk "$LOOPDEV" <