From: Dan Streetman <ddstreet@ieee.org>
Date: Mon, 18 Sep 2023 18:31:54 +0000 (-0400)
Subject: test: only load tpm_ibmvtpm kernel module on PowerPC hw
X-Git-Tag: v255-rc1~507
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=948d460ea62734c01eaf795c28ec38b49240ed0d;p=thirdparty%2Fsystemd.git

test: only load tpm_ibmvtpm kernel module on PowerPC hw

This module is only available on PPC hw, so avoid trying to load it elsewhere, as it generates a misleading error message in the logs:

modprobe: FATAL: Module tpm_ibmvtpm not found in directory /lib/modules/5.15.0-83-generic
---

diff --git a/test/TEST-70-TPM2/test.sh b/test/TEST-70-TPM2/test.sh
index 8d54c3c05c8..ec1daf9afce 100755
--- a/test/TEST-70-TPM2/test.sh
+++ b/test/TEST-70-TPM2/test.sh
@@ -16,7 +16,12 @@ test_require_bin swtpm tpm2_pcrextend tpm2_dictionarylockout
 test_append_files() {
     local workspace="${1:?}"
 
-    instmods tpm tpm_tis tpm_ibmvtpm
+    instmods tpm tpm_tis
+    machine="$(uname -m)"
+    if [ "${machine}" = "ppc64le" ]; then
+        # This module is only available on PPC hw
+        instmods tpm_ibmvtpm
+    fi
     install_dmevent
     generate_module_dependencies
     inst_binary tpm2_dictionarylockout