This is an automated email from the git hooks/post-receive script.
jforbes pushed a commit to branch master
in repository kernel-tests.
commit 366cb1abea36a5c2d0ea1f0a9fa3e5ab41742aa1
Author: Justin M. Forbes <jfor...@redhat.com>
Date: Fri Jan 15 23:02:49 2016 -0600
Fix modsign test
---
default/modsign/modsign_tests.sh | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/default/modsign/modsign_tests.sh b/default/modsign/modsign_tests.sh
index b0bab67..750e045 100755
--- a/default/modsign/modsign_tests.sh
+++ b/default/modsign/modsign_tests.sh
@@ -7,8 +7,8 @@ modsign_check_modules()
# Grab a module to mess around with. We'll pick one that is fairly
# stand-alone and rarely used.
- cp /lib/modules/`uname -r`/kernel/fs/minix/minix.ko .
-
+ cp /lib/modules/`uname -r`/kernel/fs/minix/minix.ko.xz .
+ xz -d minix.ko.xz
# Make sure we have the signed module marker
cat ./minix.ko | strings | grep "~Module signature appended~" &>
/dev/null
if [ "$?" -ne "0" ]
@@ -59,7 +59,8 @@ modsign_unsigned()
{
# Grab a module to mess around with. We'll pick one that is fairly
# stand-alone and rarely used.
- cp /lib/modules/`uname -r`/kernel/fs/minix/minix.ko .
+ cp /lib/modules/`uname -r`/kernel/fs/minix/minix.ko.xz .
+ xz -d minix.ko.xz
strip -g ./minix.ko
# Make sure it isn't already loaded
@@ -109,13 +110,13 @@ modsign_third_party()
modsign=0
if [ -f /proc/keys ]
then
- cat /proc/keys | grep module_sign &> /dev/null
+ cat /proc/keys | grep system_keyring &> /dev/null
if [ $? -ne "0" ]
then
echo Module signing not enabled
exit 3
fi
- keyring=`cat /proc/keys | grep module_sign | cut -f 1 -d " "`
+ keyring=`cat /proc/keys | grep system_keyring | cut -f 1 -d " "`
keyctl list 0x${keyring} | grep "Fedora kernel signing key" &> /dev/null
if [ $? == "0" ]
then
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
kernel mailing list
kernel@lists.fedoraproject.org
https://lists.fedoraproject.org/admin/lists/kernel@lists.fedoraproject.org
