rpms/keylime
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Suppress unnecessary error message

Browse Source 
Related: RHEL-11866

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
This commit is contained in:
Anderson Toshiyuki Sasaki 2023-10-09 17:14:40 +02:00
parent 3da6d75ef3
commit fe555461ae
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
0012-Restore-create-allowlist.patch
View File

@ -1,5 +1,5 @@
--- a/scripts/create_runtime_policy.sh 2023-10-06 10:51:36.857497863 +0200 --- a/scripts/create_runtime_policy.sh 2023-10-09 17:04:26.121194607 +0200
+++ b/scripts/create_runtime_policy.sh 2023-10-06 17:05:45.579367576 +0200 +++ b/scripts/create_runtime_policy.sh 2023-10-09 17:06:02.089855614 +0200
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
exit $NOARGS; exit $NOARGS;
fi fi
@ -18,6 +18,15 @@
if [ -d "/ostree" ]; then if [ -d "/ostree" ]; then
# If we are on an ostree system change where we look for initramfs image # 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) 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 @@ @@ -130,9 +130,26 @@
find -type f -exec $ALGO "./{}" \; | sed "s| \./\./| /|" >> $OUTPUT find -type f -exec $ALGO "./{}" \; | sed "s| \./\./| /|" >> $OUTPUT
done done

6
keylime.spec
View File

@ -9,7 +9,7 @@
Name: keylime Name: keylime
Version: 7.3.0 Version: 7.3.0
Release: 10%{?dist} Release: 11%{?dist}
Summary: Open source TPM software for Bootstrapping and Maintaining Trust Summary: Open source TPM software for Bootstrapping and Maintaining Trust
URL: https://github.com/keylime/keylime URL: https://github.com/keylime/keylime
@ -369,6 +369,10 @@ fi
%license LICENSE %license LICENSE
%changelog %changelog
* Mon Oct 09 2023 Anderson Toshiyuki Sasaki <ansasaki@redhat.com> - 7.3.0-11
- Suppress unnecessary error message
Related: RHEL-11866
* Fri Oct 06 2023 Anderson Toshiyuki Sasaki <ansasaki@redhat.com> - 7.3.0-10 * Fri Oct 06 2023 Anderson Toshiyuki Sasaki <ansasaki@redhat.com> - 7.3.0-10
- Restore allowlist generation script - Restore allowlist generation script
Resolves: RHEL-11866 Resolves: RHEL-11866