dracut-055-10.git20210824

Resolves: #1926544

0008.patch

@@ -40,3 +40,4 @@ index 73d76fbf..285e20d1 100755
  else
      exec ifup "$DEVICE"
  fi
+

0009.patch

@@ -0,0 +1,42 @@
+From 058ffa90669a4dbd2af16e025f22312408ed4ba9 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Tue, 24 Aug 2021 15:39:25 +0200
+Subject: [PATCH] 95resume: always install this module
+
+We can't always correctly decide if the resume module is needed.
+So let's play safe and always include it.
+
+see: https://github.com/dracutdevs/dracut/issues/924
+
+RHEL-only
+
+Resolves: #1926544
+---
+ modules.d/95resume/module-setup.sh | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
+index f0507b13..4f68e947 100755
+--- a/modules.d/95resume/module-setup.sh
++++ b/modules.d/95resume/module-setup.sh
+@@ -2,20 +2,6 @@
+ 
+ # called by dracut
+ check() {
+-    swap_on_netdevice() {
+-        local _dev
+-        for _dev in "${swap_devs[@]}"; do
+-            block_is_netdevice "$_dev" && return 0
+-        done
+-        return 1
+-    }
+-
+-    # Only support resume if hibernation is currently on
+-    # and no swap is mounted on a net device
+-    [[ $hostonly ]] || [[ $mount_needs ]] && {
+-        swap_on_netdevice || [[ "$(cat /sys/power/resume)" == "0:0" ]] && return 255
+-    }
+-
+     return 0
+ }
+ 

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 9.git20210812
+%define dist_free_release 10.git20210824
 
 Name: dracut
 Version: 055
@@ -37,6 +37,7 @@ Patch5: 0005.patch
 Patch6: 0006.patch
 Patch7: 0007.patch
 Patch8: 0008.patch
+Patch9: 0009.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
@@ -492,6 +493,9 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
 
 %changelog
+* Tue Aug 24 2021 Lukas Nykryn <lnykryn@redhat.com> - 055-10.git20210824
+- 95resume: always install this module
+
 * Thu Aug 12 2021 Lukas Nykryn <lnykryn@redhat.com> - 055-9.git20210812
 - fix(kernel-modules): add blk_mq_alloc_disk and
 - fix(network-manager): check for nm-initrd-generator in both