43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
|
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
|
||
|
|
}
|
||
|
|
|