From 9a53395458785b43f205c5aa4a2730fa3d4057a3 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 19 Dec 2019 16:39:26 -0500 Subject: meta-security: subtree update:2df7dd9fba..3001c3ebfc Armin Kuster (6): meta-security: add layer index callouts meta-security-compliance/conf/layer.conf: fix typo python3-suricata-update: update to 1.1.1 libhtp: bugfix only update 0.5.32 lib/oeqa/runtime: suricata add tests suricata: update to 4.1.6 Philip Tricca (1): tpm2-abrmd: Port command line options to new version. Trevor Woerner (1): tpm2-abrmd-init.sh: fix for /dev/tpmrmX Yi Zhao (1): libseccomp: upgrade 2.4.1 -> 2.4.2 Change-Id: Ic00ca8ac8ff5d3fbe0b79aa4a42243b197080f14 Signed-off-by: Brad Bishop --- meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh | 2 +- meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-security/meta-tpm/recipes-tpm2') diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh index c8dfb7de3..9bb7da972 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh @@ -27,7 +27,7 @@ case "${1}" in start) echo -n "Starting $DESC: " - if [ ! -e /dev/tpm* ] + if [ ! -e /dev/tpm? ] then echo "device driver not loaded, skipping." exit 0 diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default index 987978a66..b4b3c2072 100644 --- a/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default +++ b/meta-security/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default @@ -1 +1 @@ -DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans" +DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20 --flush-all" -- cgit v1.2.3