From fe555461aed8fab2cefc428a2afe919e5f7e7e9b Mon Sep 17 00:00:00 2001 From: Anderson Toshiyuki Sasaki Date: Mon, 9 Oct 2023 17:14:40 +0200 Subject: [PATCH] Suppress unnecessary error message Related: RHEL-11866 Signed-off-by: Anderson Toshiyuki Sasaki --- 0012-Restore-create-allowlist.patch | 13 +++++++++++-- keylime.spec | 6 +++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/0012-Restore-create-allowlist.patch b/0012-Restore-create-allowlist.patch index f1ac3a6..1e065ff 100644 --- a/0012-Restore-create-allowlist.patch +++ b/0012-Restore-create-allowlist.patch @@ -1,5 +1,5 @@ ---- a/scripts/create_runtime_policy.sh 2023-10-06 10:51:36.857497863 +0200 -+++ b/scripts/create_runtime_policy.sh 2023-10-06 17:05:45.579367576 +0200 +--- a/scripts/create_runtime_policy.sh 2023-10-09 17:04:26.121194607 +0200 ++++ b/scripts/create_runtime_policy.sh 2023-10-09 17:06:02.089855614 +0200 @@ -42,7 +42,7 @@ exit $NOARGS; fi @@ -18,6 +18,15 @@ if [ -d "/ostree" ]; then # If we are on an ostree system change where we look for initramfs image loc=$(grep -E "/ostree/[^/]([^/]*)" -o /proc/cmdline | head -n 1 | cut -d / -f 3) +@@ -121,7 +121,7 @@ + cp -r /tmp/ima/$i-extracted-unmk/. /tmp/ima/$i-extracted + fi + elif [[ -x "/usr/lib/dracut/skipcpio" ]] ; then +- /usr/lib/dracut/skipcpio $i | gunzip -c | cpio -i -d 2> /dev/null ++ /usr/lib/dracut/skipcpio $i | gunzip -c 2> /dev/null | cpio -i -d 2> /dev/null + else + echo "ERROR: No tools for initramfs image processing found!" + break @@ -130,9 +130,26 @@ find -type f -exec $ALGO "./{}" \; | sed "s| \./\./| /|" >> $OUTPUT done diff --git a/keylime.spec b/keylime.spec index 7ebd4c9..8e97153 100644 --- a/keylime.spec +++ b/keylime.spec @@ -9,7 +9,7 @@ Name: keylime Version: 7.3.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Open source TPM software for Bootstrapping and Maintaining Trust URL: https://github.com/keylime/keylime @@ -369,6 +369,10 @@ fi %license LICENSE %changelog +* Mon Oct 09 2023 Anderson Toshiyuki Sasaki - 7.3.0-11 +- Suppress unnecessary error message + Related: RHEL-11866 + * Fri Oct 06 2023 Anderson Toshiyuki Sasaki - 7.3.0-10 - Restore allowlist generation script Resolves: RHEL-11866