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