Marcus Meissner
0f203926a1
- Rename patch:
* From 0211-fix_multipath_check_hostonly.patch
to 0303-fix_multipath_check_hostonly.patch
- Rename patch:
* From 0213-10i18n-keymap-find.patch
to 0213-Fix-wrong-keymap-inclusion.patch
- 95fcoe: Do not complain about missing /etc/hba.conf (bsc#980539)
* Add 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
- 95fcoe: silence lldpad warnings
* Add 0216-95fcoe-silence-lldpad-warnings.patch
- 95fcoe: Allow to specify the FCoE mode via the fcoe= parameter
* Add 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
- 40network: allow persistent interface names (bsc#995284)
* Add 0218-40network-allow-persistent-interface-names.patch
- 95fcoe: use interface names instead of MAC addresses
* Add 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
- 95fcoe: always set AUTO_VLAN for fcoemon (bsc#995019)
* Add 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
- 95fcoe: Add shutdown script (bsc#994860)
* Add 0221-95fcoe-Add-shutdown-script.patch
- 90dm: Fixup shutdown script (bsc#994860)
* Add 0222-90dm-Fixup-shutdown-script.patch
- 90dm: fixup dependency cycle between MD and DM shutdown (bsc#994860)
* Add 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
- 90multipath: Start daemon after udev settle (bsc#986734)
* Add 0304-90multipath-Start-daemon-after-udev-settle.patch
- 90multipath: load dm_multipath module during startup
* Add 0305-90multipath-load-dm_multipath-module-during-startup.patch
- 90multipath: add shutdown script (bsc#994860)
OBS-URL: https://build.opensuse.org/request/show/422869
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=263
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
From a15945f1cd7cac0ad472807ca7979726dd34288b Mon Sep 17 00:00:00 2001
|
|
From: Marcus Meissner <meissner@suse.de>
|
|
Date: Mon, 2 Jun 2014 15:02:04 +0200
|
|
Subject: [PATCH] 01fips: fixup loading issues
|
|
|
|
Adjust the FIPS module list to avoid loading issues
|
|
|
|
References: bnc#875855
|
|
|
|
Signed-off-by: Marcus Meissner <meissner@suse.de>
|
|
---
|
|
modules.d/01fips/fips.sh | 12 ++++++++++++
|
|
modules.d/01fips/module-setup.sh | 6 +++++-
|
|
2 files changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
|
|
index 6acdf62..835f520 100755
|
|
--- a/modules.d/01fips/fips.sh
|
|
+++ b/modules.d/01fips/fips.sh
|
|
@@ -98,6 +98,18 @@ do_fips()
|
|
_found=1
|
|
break
|
|
done </proc/crypto
|
|
+ # 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}" \
|
|
+ -o "$_module" != "${_module%z90}" \
|
|
+ ]; then
|
|
+ _found=1
|
|
+ fi
|
|
+ fi
|
|
+
|
|
[ "$_found" = "0" ] && return 1
|
|
fi
|
|
fi
|
|
diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
|
|
index 7278347..18c8377 100755
|
|
--- a/modules.d/01fips/module-setup.sh
|
|
+++ b/modules.d/01fips/module-setup.sh
|
|
@@ -19,6 +19,8 @@ installkernel() {
|
|
_fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
|
|
_fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
|
|
_fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key ghash_s390 sha1_s390 sha512_s390"
|
|
+ _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
|
|
+ _fipsmodules+="ghash-clmulni-intel "
|
|
|
|
mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
|
|
|
|
@@ -44,7 +46,9 @@ install() {
|
|
libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \
|
|
libfreeblpriv3.so libfreeblpriv3.chk
|
|
|
|
- inst_multiple -o prelink
|
|
+ # we do not use prelink at SUSE
|
|
+ #inst_multiple -o prelink
|
|
+
|
|
inst_simple /etc/system-fips
|
|
}
|
|
|
|
--
|
|
2.6.6
|
|
|