summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2019-12-06 10:13:47 +0000
committerArmin Kuster <akuster808@gmail.com>2019-12-07 15:31:42 -0800
commit6d059a9d34167539b66662d1d82f8038a5ddfae7 (patch)
tree659da79ead700ab6bd967a17ceb9fa96a8878493
parent72b05edff59fbeed58b1258b7b148b1461f8ca38 (diff)
downloadmeta-security-6d059a9d34167539b66662d1d82f8038a5ddfae7.tar.gz
tpm2-abrmd-init.sh: fix for /dev/tpmrmX
Newer kernels, in addition to the traditional /dev/tpmX device nodes, are now also creating /dev/tpmrmX device nodes. This causes this script to get confused and abort, meaning tpm2-abrmd does not get started during boot. Fix for https://github.com/flihp/meta-measured/issues/56 Signed-off-by: Trevor Woerner <twoerner@gmail.com> Signed-off-by: Diego Santa Cruz <Diego.SantaCruz@spinetix.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh b/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh
index c8dfb7d..9bb7da9 100644
--- a/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh
+++ b/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh
@@ -27,7 +27,7 @@ case "${1}" in
27 start) 27 start)
28 echo -n "Starting $DESC: " 28 echo -n "Starting $DESC: "
29 29
30 if [ ! -e /dev/tpm* ] 30 if [ ! -e /dev/tpm? ]
31 then 31 then
32 echo "device driver not loaded, skipping." 32 echo "device driver not loaded, skipping."
33 exit 0 33 exit 0