From 7430406aed84822031829ec731b00bf0cdf93c5e Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Apr 22 2021 18:18:42 +0000
Subject: add watchdog drivers for generic initrd (rhbz 1592148)


---

diff --git a/0001-fix-90kernel-modules-add-watchdog-drivers-for-generi.patch b/0001-fix-90kernel-modules-add-watchdog-drivers-for-generi.patch
new file mode 100644
index 0000000..79bba94
--- /dev/null
+++ b/0001-fix-90kernel-modules-add-watchdog-drivers-for-generi.patch
@@ -0,0 +1,32 @@
+From 82549210c375075bf79ad77bb915ed2d0808d60a Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Wed, 21 Apr 2021 12:50:41 +0100
+Subject: [PATCH] fix(90kernel-modules): add watchdog drivers for generic
+ initrd
+
+The watchdog module pulls in the device specific watchdog if that
+module is enabled, but in the case where we need a generic initrd
+we don't get all watchdog drivers which means if we have a watchdog
+enabled for that usecase it may get kicked too late in the boot
+process so we need the drivers in the initrd for the generic case too.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ modules.d/90kernel-modules/module-setup.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
+index 1a1b56a2..b3c91f21 100755
+--- a/modules.d/90kernel-modules/module-setup.sh
++++ b/modules.d/90kernel-modules/module-setup.sh
+@@ -59,6 +59,7 @@
+             "=drivers/pci/host" \
+             "=drivers/pci/controller" \
+             "=drivers/pinctrl" \
++            "=drivers/watchdog" \
+             ${NULL}
+ 
+         instmods \
+-- 
+2.31.1
+
diff --git a/dracut.spec b/dracut.spec
index d2db0b7..b30a82a 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -5,7 +5,7 @@
 # strip the automatically generated dep here and instead co-own the
 # directory.
 %global __requires_exclude pkg-config
-%define dist_free_release 4
+%define dist_free_release 5
 
 Name: dracut
 Version: 053
@@ -49,6 +49,9 @@ Patch3: 0001-fix-network-manager-nm-run.service-don-t-kill-forked.patch
 # https://github.com/dracutdevs/dracut/pull/1347
 Patch4: 0001-fix-network-manager-only-run-NetworkManager-if-rd.ne.patch
 Patch5: 0002-fix-network-manager-use-run-NetworkManager-initrd-ne.patch
+# add watchdog drivers for generic initrd
+# https://github.com/dracutdevs/dracut/pull/1377
+Patch6: 0001-fix-90kernel-modules-add-watchdog-drivers-for-generi.patch
 
 BuildRequires: bash
 BuildRequires: git-core
@@ -498,6 +501,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
 
 %changelog
+* Thu Apr 22 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 053-5
+- Backport: fix(90kernel-modules): add watchdog drivers for generic initrd (rhbz 1592148)
+
 * Mon Apr 19 2021 Dusty Mabe <dusty@dustymabe.com> - 053-4
 - Backport: fix(dracut-logger.sh): double dash trigger unknown logger warnings during run
 - Backport: fix(network-manager): nm-run.service: don't kill forked processes