From 49a75f3f14ba88f12b86bd3761c4623a32d8b159 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 04 2015 18:00:14 +0000
Subject: import dracut-033-241.el7_1.5


---

diff --git a/SOURCES/0249-crypt-add-drbg-kernel-module.patch b/SOURCES/0249-crypt-add-drbg-kernel-module.patch
new file mode 100644
index 0000000..c80bd09
--- /dev/null
+++ b/SOURCES/0249-crypt-add-drbg-kernel-module.patch
@@ -0,0 +1,22 @@
+From bd98c4def15c64c5d34b13e54991d672104ca1d0 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 2 Jul 2015 15:00:41 +0200
+Subject: [PATCH] crypt: add drbg kernel module
+
+---
+ modules.d/90crypt/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
+index 267d39d..272e527 100755
+--- a/modules.d/90crypt/module-setup.sh
++++ b/modules.d/90crypt/module-setup.sh
+@@ -23,7 +23,7 @@ depends() {
+ }
+ 
+ installkernel() {
+-    instmods dm_crypt =crypto
++    instmods dm_crypt =crypto drbg
+ }
+ 
+ cmdline() {
diff --git a/SOURCES/0283-crypt-install-drbg-unconditionally-in-hostonly-mode.patch b/SOURCES/0283-crypt-install-drbg-unconditionally-in-hostonly-mode.patch
new file mode 100644
index 0000000..1953af7
--- /dev/null
+++ b/SOURCES/0283-crypt-install-drbg-unconditionally-in-hostonly-mode.patch
@@ -0,0 +1,24 @@
+From 89948e58fd0f80def0912c18c503912873aa9c48 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Thu, 9 Jul 2015 16:14:50 +0200
+Subject: [PATCH] crypt: install drbg unconditionally in hostonly mode
+
+older kernels had the drbg kernel module and didn't need it
+---
+ modules.d/90crypt/module-setup.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
+index dbc87a4..bd37d9a 100755
+--- a/modules.d/90crypt/module-setup.sh
++++ b/modules.d/90crypt/module-setup.sh
+@@ -23,7 +23,8 @@ depends() {
+ }
+ 
+ installkernel() {
+-    instmods dm_crypt =crypto drbg
++    instmods dm_crypt =crypto
++    hostonly="" instmods drbg
+ }
+ 
+ cmdline() {
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index c410681..35cb38a 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 033
-Release: 241%{?dist}.3
+Release: 241%{?dist}.5
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -273,6 +273,10 @@ Patch240: 0240-network-do-not-destroy-the-team-interface-on-teamd-s.patch
 Patch243: 0243-fips-add-some-s390-kernel-modules.patch
 Patch244: 0244-rearrange-fips-module-ordering-due-to-zlib.patch
 
+Patch249: 0249-crypt-add-drbg-kernel-module.patch
+
+Patch283: 0283-crypt-install-drbg-unconditionally-in-hostonly-mode.patch
+
 BuildRequires: bash git
 
 %if 0%{?fedora} || 0%{?rhel}
@@ -697,6 +701,14 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jul 09 2015 Harald Hoyer <harald@redhat.com> 033-241.5
+- unconditionally install the drbg module in hostonly mode
+Resolves: rhbz#1241187
+
+* Wed Jul 08 2015 Harald Hoyer <harald@redhat.com> 033-241.4
+- add drbg to crypto
+Resolves: rhbz#1241187
+
 * Thu May 07 2015 Harald Hoyer <harald@redhat.com> 033-241.3
 - fips: rearrange fips modules due to zlib
 Resolves: rhbz#1216086