1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
|
From: Benjamin Drung <benjamin.drung@canonical.com>
Date: Mon, 10 Feb 2025 21:33:34 +0100
Subject: test(FULL-SYSTEMD): skip encrypted root if qemu -smbios is not
supported
The qemu option `-smbios` is not supported on most architectures.
Therefore `TEIT-41-FULL-SYSTEMD` will fail.
Fixes #1213
Forwarded: https://github.com/dracut-ng/dracut-ng/pull/1217
---
test/TEST-41-FULL-SYSTEMD/test.sh | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/test/TEST-41-FULL-SYSTEMD/test.sh b/test/TEST-41-FULL-SYSTEMD/test.sh
index 4177d02..9f68b06 100755
--- a/test/TEST-41-FULL-SYSTEMD/test.sh
+++ b/test/TEST-41-FULL-SYSTEMD/test.sh
@@ -52,11 +52,16 @@ test_run() {
# shellcheck source=$TESTDIR/luks.uuid
. "$TESTDIR"/luks.uuid
- # luks
- client_run "encrypted root with rd.luks.uuid" "type=11,value=io.systemd.credential:key=test" \
- "rw root=LABEL=dracut_crypt rd.luks.uuid=$ID_FS_UUID rd.luks.key=/run/credentials/@system/key" || return 1
- client_run "encrypted root with rd.luks.name" "type=11,value=io.systemd.credential:key=test" \
- "rw root=/dev/mapper/crypt rd.luks.name=$ID_FS_UUID=crypt rd.luks.key=/run/credentials/@system/key" || return 1
+ if "$testdir"/run-qemu --supports -smbios; then
+ # luks
+ client_run "encrypted root with rd.luks.uuid" "type=11,value=io.systemd.credential:key=test" \
+ "rw root=LABEL=dracut_crypt rd.luks.uuid=$ID_FS_UUID rd.luks.key=/run/credentials/@system/key" || return 1
+ client_run "encrypted root with rd.luks.name" "type=11,value=io.systemd.credential:key=test" \
+ "rw root=/dev/mapper/crypt rd.luks.name=$ID_FS_UUID=crypt rd.luks.key=/run/credentials/@system/key" || return 1
+ else
+ echo "CLIENT TEST: encrypted root with rd.luks.uuid [SKIPPED]"
+ echo "CLIENT TEST: encrypted root with rd.luks.name [SKIPPED]"
+ fi
return 0
}
|