From ad5e2547e73d8755ede0c435e8de9c5ecb4257f3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 26 2015 09:21:28 +0000
Subject: import dracut-033-241.el7_1.1


---

diff --git a/SOURCES/0239-fips-add-drbg-kernel-module.patch b/SOURCES/0239-fips-add-drbg-kernel-module.patch
new file mode 100644
index 0000000..3709505
--- /dev/null
+++ b/SOURCES/0239-fips-add-drbg-kernel-module.patch
@@ -0,0 +1,23 @@
+From f2558ddcc1c6217d51c731792762ca20b1e3e125 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 19 Feb 2015 10:45:35 +0100
+Subject: [PATCH] fips: add drbg kernel module
+
+(cherry picked from commit 7e9341434fca7606d11ffce99bda61a4ccb9ef10)
+---
+ modules.d/01fips/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 906b49f..48156e7 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
+@@ -13,7 +13,7 @@ depends() {
+ installkernel() {
+     local _fipsmodules _mod
+     _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
+-    _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod "
++    _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
+     _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
+     _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"
diff --git a/SOURCES/0239-network-do-not-destroy-the-team-interface-on-teamd-s.patch b/SOURCES/0239-network-do-not-destroy-the-team-interface-on-teamd-s.patch
deleted file mode 100644
index 1ed4044..0000000
--- a/SOURCES/0239-network-do-not-destroy-the-team-interface-on-teamd-s.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e7f59d71ae180ed519b83115d9b41f9b3ba000e4 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 26 Jan 2015 15:12:08 +0000
-Subject: [PATCH] network: do not destroy the team interface on teamd shutdown
-
-when doing switch-root teamd gets killed, which tears down the team
-interface, if teamd is not started with "-N".
-
-(cherry picked from commit 2a12e9747524dc719e0da9a9d8c382f957cc13de)
----
- modules.d/40network/ifup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 524a3fb..bd7db02 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -223,7 +223,7 @@ if [ -e /tmp/team.${netif}.info ]; then
-             fi
-         done
-         # Do not add slaves now
--        teamd -d -U -n -t $teammaster -f /etc/teamd/${teammaster}.conf
-+        teamd -d -U -n -N -t $teammaster -f /etc/teamd/$teammaster.conf
-         for slave in $working_slaves; do
-             # team requires the slaves to be down before joining team
-             ip link set dev $slave down
diff --git a/SOURCES/0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch b/SOURCES/0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch
new file mode 100644
index 0000000..0518ab0
--- /dev/null
+++ b/SOURCES/0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch
@@ -0,0 +1,26 @@
+From 3f7d943141f543a2b9f1db612dccae502e4d556b Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Mon, 26 Jan 2015 15:12:08 +0000
+Subject: [PATCH] network: do not destroy the team interface on teamd shutdown
+
+when doing switch-root teamd gets killed, which tears down the team
+interface, if teamd is not started with "-N".
+
+(cherry picked from commit 2a12e9747524dc719e0da9a9d8c382f957cc13de)
+---
+ modules.d/40network/ifup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index 524a3fb..bd7db02 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
+@@ -223,7 +223,7 @@ if [ -e /tmp/team.${netif}.info ]; then
+             fi
+         done
+         # Do not add slaves now
+-        teamd -d -U -n -t $teammaster -f /etc/teamd/${teammaster}.conf
++        teamd -d -U -n -N -t $teammaster -f /etc/teamd/$teammaster.conf
+         for slave in $working_slaves; do
+             # team requires the slaves to be down before joining team
+             ip link set dev $slave down
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index 8bfab89..b34c299 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 033
-Release: 240%{?dist}
+Release: 241%{?dist}.1
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -267,7 +267,8 @@ Patch235: 0235-network-enhance-team-support.patch
 Patch236: 0236-dracut-fixed-module-dependency-handling.patch
 Patch237: 0237-network-net-lib.sh-parse_iscsi_root-fix-c-p-bug.patch
 Patch238: 0238-network-ifup-source-team-info-if-present.patch
-Patch239: 0239-network-do-not-destroy-the-team-interface-on-teamd-s.patch
+Patch239: 0239-fips-add-drbg-kernel-module.patch
+Patch240: 0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch
 
 
 BuildRequires: bash git
@@ -694,6 +695,13 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Feb 19 2015 Harald Hoyer <harald@redhat.com> 033-241.1
+- subversion inc
+
+* Thu Feb 19 2015 Harald Hoyer <harald@redhat.com> 033-241
+- fips: load the drbg kernel module
+Resolves: rhbz#1194201
+
 * Mon Jan 26 2015 Harald Hoyer <harald@redhat.com> 033-240
 - fixed team implementation
 Resolves: rhbz#1147521