40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
|
From e8804fc3d2052000d66661ced4a03103e0176e63 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Molkentin <dmolkentin@suse.com>
|
||
|
|
Date: Tue, 7 Mar 2017 11:51:17 +0100
|
||
|
|
Subject: [PATCH] 01fips: Some modules use separators other than "-"
|
||
|
|
|
||
|
|
We need to account for that in our exception list
|
||
|
|
of modules that are fine to fail. This only happened
|
||
|
|
on non-Intel machines, because the intel modules
|
||
|
|
use "_" as separator.
|
||
|
|
|
||
|
|
Original-Patch-By: Marcus Meissner <meissner@suse.de>
|
||
|
|
Reference: bsc#1021687
|
||
|
|
---
|
||
|
|
modules.d/01fips/fips.sh | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
|
||
|
|
index 055093a..30f53b4 100755
|
||
|
|
--- a/modules.d/01fips/fips.sh
|
||
|
|
+++ b/modules.d/01fips/fips.sh
|
||
|
|
@@ -105,11 +105,11 @@ do_fips()
|
||
|
|
# If we find some hardware specific modules and cannot load them
|
||
|
|
# it is not a problem, proceed.
|
||
|
|
if [ "$_found" = "0" ]; then
|
||
|
|
- if [ "$_module" != "${_module%-intel}" \
|
||
|
|
- -o "$_module" != "${_module%-ssse3}" \
|
||
|
|
- -o "$_module" != "${_module%-x86_64}" \
|
||
|
|
+ if [ "$_module" != "${_module%intel}" \
|
||
|
|
+ -o "$_module" != "${_module%ssse3}" \
|
||
|
|
+ -o "$_module" != "${_module%x86_64}" \
|
||
|
|
-o "$_module" != "${_module%z90}" \
|
||
|
|
- -o "$_module" != "${_module%s390}" \
|
||
|
|
+ -o "$_module" != "${_module%s390}" \
|
||
|
|
]; then
|
||
|
|
_found=1
|
||
|
|
fi
|
||
|
|
--
|
||
|
|
2.10.2
|
||
|
|
|