From 345d7b4b0a59b804d8d573031c1fe0cb28584f1b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 09 2014 07:26:45 +0000
Subject: import dracut-033-161.el7


---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..41b060f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/dracut-033.tar.bz2
diff --git a/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch b/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch
new file mode 100644
index 0000000..027bd05
--- /dev/null
+++ b/SOURCES/0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch
@@ -0,0 +1,24 @@
+From 89353cd0cca255a5639e40992d58b8de596b66fb Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Mon, 28 Apr 2014 12:45:44 +0200
+Subject: [PATCH] dracut-functions.sh: add /lib/modules/*/{extras|weak-updates}
+ for kernel modules
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1086291
+---
+ dracut-functions.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index bddcdcf..cb43f7a 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -1530,7 +1530,7 @@ find_kernel_modules_by_path () {
+     _OLDIFS=$IFS
+     IFS=:
+     while read a rest; do
+-        [[ $a = */$1/* ]] || [[ $a = updates/* ]] || continue
++        [[ $a = */$1/* ]] || [[ $a = updates/* ]] || [[ $a = extra/* ]] || [[ $a = weak-updates/* ]] ||continue
+         printf "%s\n" "$srcmods/$a"
+     done < "$srcmods/modules.dep"
+     IFS=$_OLDIFS
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index 07d21a1..51db224 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -10,7 +10,7 @@
 
 Name: dracut
 Version: 033
-Release: 160%{?dist}
+Release: 161%{?dist}
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -188,6 +188,7 @@ Patch156: 0156-fcoe-workaround-fcoe-timing-issues.patch
 Patch157: 0157-Add-legacy-flag-l-to-lz4-and-update-magic-number.patch
 Patch158: 0158-fs-lib-always-install-fsck.-fs-if-present.patch
 Patch159: 0159-ifcfg-write-ifcfg.sh-turn-on-IPV6INIT-if-any-inet6-a.patch
+Patch160: 0160-dracut-functions.sh-add-lib-modules-extras-weak-upda.patch
 
 
 BuildRequires: bash git
@@ -614,6 +615,10 @@ rm -rf -- $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Apr 28 2014 Harald Hoyer <harald@redhat.com> 033-161
+- add extra and weak-updates kernel module dirs
+Resolves: rhbz#1086291
+
 * Fri Apr 04 2014 Harald Hoyer <harald@redhat.com> 033-160
 - add fsck.<filesystem>, if it exists
 Resolves: rhbz#1083654