From 5b232aeb3fdaf9502cf1d0959fc8ba6a4124167f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 16 2018 12:49:53 +0000
Subject: import dracut-033-535.el7_5.1


---

diff --git a/SOURCES/0001-dracut.sh-workaround-broken-read-from-proc-modules.patch b/SOURCES/0001-dracut.sh-workaround-broken-read-from-proc-modules.patch
new file mode 100644
index 0000000..99f25ba
--- /dev/null
+++ b/SOURCES/0001-dracut.sh-workaround-broken-read-from-proc-modules.patch
@@ -0,0 +1,46 @@
+From 14af2ab39994576bda1d2a6b9c7980f08473e784 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Mon, 11 Jun 2018 11:07:59 +0200
+Subject: [PATCH] dracut.sh: workaround broken read from /proc/modules
+
+RHEL-only (upstream is using libkmod)
+Resolves: #1578222
+---
+ dracut.sh | 21 +++++++++++++++++----
+ 1 file changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 873274c..9dadece 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -1145,10 +1145,23 @@ if [[ $hostonly ]]; then
+ 
+     # check /proc/modules
+     declare -A host_modules
+-    while read m rest; do
+-        [ -z "$m" ] && continue
+-        host_modules["$m"]=1
+-    done </proc/modules
++    declare new_module_found=1
++    declare tmpmodules=$(mktemp --tmpdir="$TMPDIR/" -t proc_modules.XXXXXX)
++    while [[ $new_module_found ]]; do
++        new_module_found=
++        sleep 0.1
++        #reading from procfs can be broken, so copy the file elsewhere
++        cp -f /proc/modules "$tmpmodules"
++        while read m rest; do
++            [ -z "$m" ] && continue
++            [[ ${host_modules["$m"]} ]] && continue
++            host_modules["$m"]=1
++            new_module_found=1
++        done < "$tmpmodules"
++    done
++    rm "$tmpmodules"
++    unset new_module_found
++    unset tmpmodules
+ fi
+ 
+ unset m
+-- 
+2.14.4
+
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index 3c0be0d..121c4d1 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 033
-Release: 535%{?dist}
+Release: 535%{?dist}.1
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -564,6 +564,8 @@ Patch532: 0532-base-dracut-lib.sh-remove-bashism.patch
 Patch533: 0533-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
 Patch534: 0534-90lvm-always-add-dm-snapshot.patch
 
+Patch900: 0001-dracut.sh-workaround-broken-read-from-proc-modules.patch
+
 
 BuildRequires: bash git
 
@@ -995,6 +997,10 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jun 13 2018 Lukas Nykryn <lnykryn@redhat.com> - 033-535.1
+- dracut.sh: workaround broken read from /proc/modules
+Resolves: #1578222
+
 * Mon Feb 19 2018 Lukas Nykryn <lnykryn@redhat.com> - 033-535
 - 90lvm: always add dm-snapshot
 Resolves: #1546577