|
 |
d1a34d |
From 9e17bed7c0f30f6c557f837592772522c384779b Mon Sep 17 00:00:00 2001
|
|
|
d1a34d |
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
|
d1a34d |
Date: Tue, 15 Feb 2022 13:44:16 +0100
|
|
|
d1a34d |
Subject: [PATCH] Revert "95resume: always install this module"
|
|
|
d1a34d |
|
|
|
d1a34d |
This reverts commit 058ffa90669a4dbd2af16e025f22312408ed4ba9.
|
|
|
d1a34d |
|
|
|
d1a34d |
Resolves: #2017787
|
|
|
d1a34d |
---
|
|
|
d1a34d |
modules.d/95resume/module-setup.sh | 14 ++++++++++++++
|
|
|
d1a34d |
1 file changed, 14 insertions(+)
|
|
|
d1a34d |
|
|
|
d1a34d |
diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
|
|
|
d1a34d |
index 4f68e947..f0507b13 100755
|
|
|
d1a34d |
--- a/modules.d/95resume/module-setup.sh
|
|
|
d1a34d |
+++ b/modules.d/95resume/module-setup.sh
|
|
|
d1a34d |
@@ -2,6 +2,20 @@
|
|
|
d1a34d |
|
|
|
d1a34d |
# called by dracut
|
|
|
d1a34d |
check() {
|
|
|
d1a34d |
+ swap_on_netdevice() {
|
|
|
d1a34d |
+ local _dev
|
|
|
d1a34d |
+ for _dev in "${swap_devs[@]}"; do
|
|
|
d1a34d |
+ block_is_netdevice "$_dev" && return 0
|
|
|
d1a34d |
+ done
|
|
|
d1a34d |
+ return 1
|
|
|
d1a34d |
+ }
|
|
|
d1a34d |
+
|
|
|
d1a34d |
+ # Only support resume if hibernation is currently on
|
|
|
d1a34d |
+ # and no swap is mounted on a net device
|
|
|
d1a34d |
+ [[ $hostonly ]] || [[ $mount_needs ]] && {
|
|
|
d1a34d |
+ swap_on_netdevice || [[ "$(cat /sys/power/resume)" == "0:0" ]] && return 255
|
|
|
d1a34d |
+ }
|
|
|
d1a34d |
+
|
|
|
d1a34d |
return 0
|
|
|
d1a34d |
}
|
|
|
d1a34d |
|
|
|
d1a34d |
|