diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2024-01-12 10:27:43 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2024-01-12 15:34:04 +0100 |
| commit | a0b50e4d25cffdb1e6bb289bcfe7f344969e0fc0 (patch) | |
| tree | 4cc9dee1a5906ba3a9cd3e1454ed38d12940071f /test/test-functions | |
| parent | man: fix typo AV_VSOCK → AF_VSOCK (diff) | |
| download | systemd-a0b50e4d25cffdb1e6bb289bcfe7f344969e0fc0.tar.xz systemd-a0b50e4d25cffdb1e6bb289bcfe7f344969e0fc0.zip | |
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
Diffstat (limited to 'test/test-functions')
| -rw-r--r-- | test/test-functions | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index 1ee41b636d..92bb7d532b 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" <<EOF label: gpt type=C12A7328-F81F-11D2-BA4B-00A0C93EC93B name=esp size=${esp_size}M -type=$(systemd-id128 show root -Pu) name=root size=${root_size}M bootable +type=$("${SYSTEMD_ID128:?}" show root -Pu) name=root size=${root_size}M bootable type=BC13C2FF-59E6-4262-A352-B275FD6F7172 name=boot size=${boot_size}M type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 name=data EOF |