From a4bf1476ef382067f107760581ee56f656f95dd9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 29 2019 17:20:41 +0000
Subject: import dracut-049-10.git20190115.el8_0.1


---

diff --git a/SOURCES/0024.patch b/SOURCES/0024.patch
new file mode 100644
index 0000000..28b2e15
--- /dev/null
+++ b/SOURCES/0024.patch
@@ -0,0 +1,36 @@
+From 9b2497dffb8f699ce040cdbafa967f5fe02b57b6 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Fri, 2 Aug 2019 14:26:23 +0200
+Subject: [PATCH] 90kernel-modules-extra: don't resolve symlinks before instmod
+
+When you install a third-party driver, you will probably end in a
+situation, where the module will be in a different directory and
+in $depmod_module_dir you will only have symlink. If we resolve the
+symlink before we pass the module path to instmod, the dracut-install
+will only include the module with its original path, but not the
+symlink. Hence the module can't be automatically loaded.
+
+Dracut-install is clever enough to handle symlinks and will include both
+the symlink and the module to the initrd.
+
+(cherry picked from commit d1afff43aea01c8d43817adf3ac4041dd4b9f022)
+
+Resolves: #1720275
+---
+ modules.d/90kernel-modules-extra/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90kernel-modules-extra/module-setup.sh b/modules.d/90kernel-modules-extra/module-setup.sh
+index c0a2b7f9..1706c822 100755
+--- a/modules.d/90kernel-modules-extra/module-setup.sh
++++ b/modules.d/90kernel-modules-extra/module-setup.sh
+@@ -187,7 +187,7 @@ installkernel()
+ 	printf "^%s\.ko(\.gz|\.bz2|\.xz)?:\n" "${pathlist[@]}" \
+ 		| (LANG=C grep -E -o -f - -- "$depmod_modules_dep" || exit 0) \
+ 		| tr -d ':' \
+-		| (cd "$depmod_module_dir" || exit; xargs -r realpath -e --) \
++		| (cd "$depmod_module_dir" || exit; xargs -r realpath -se --) \
+ 		| instmods || return 1
+ 
+ 	return 0
+
diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec
index 22c9c5b..4fecf8a 100644
--- a/SPECS/dracut.spec
+++ b/SPECS/dracut.spec
@@ -9,7 +9,7 @@
 
 Name: dracut
 Version: 049
-Release: %{dist_free_release}%{?dist}
+Release: %{dist_free_release}%{?dist}.1
 
 Summary: Initramfs generator using udev
 %if 0%{?fedora} || 0%{?rhel}
@@ -37,6 +37,7 @@ Patch6: 0006.patch
 Patch7: 0007.patch
 Patch8: 0008.patch
 Patch9: 0009.patch
+Patch10: 0024.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
@@ -489,6 +490,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
 %endif
 
 %changelog
+* Wed Sep 25 2019 Lukas Nykryn <lnykryn@redhat.com> - 049-10.git20190115.1
+- rebuilt
+
 * Tue Jan 15 2019 Lukas Nykryn <lnykryn@redhat.com> - 049-10.git20190115
 - 95iscsi: decouple iscsi from sysinit.target