5857b7d190
From-source-git-commit: e3d7b6907c414bbe25a93a3fcd2de2205316c13f Changes added using `packit source-git update-dist-git`, which has different patch definition format than `centpkg import` (this will be used from now on). Also, fixup previous entry wrong date in %changelog.
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 23a7d5d4752dd4273f406cf1729b2d98f39d0aa5 Mon Sep 17 00:00:00 2001
|
|
From: Pavel Valena <pvalena@redhat.com>
|
|
Date: Sat, 17 Aug 2024 00:39:17 +0200
|
|
Subject: [PATCH 26/31] fix(resume): do not include resume if swap is on
|
|
netdevice
|
|
|
|
Additional fix, restoring previous behavior identical to RHEL-9.
|
|
|
|
rhel-only
|
|
|
|
Resolves: RHEL-53350
|
|
---
|
|
modules.d/95resume/module-setup.sh | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
|
|
index c0f04a6c..785f681a 100755
|
|
--- a/modules.d/95resume/module-setup.sh
|
|
+++ b/modules.d/95resume/module-setup.sh
|
|
@@ -4,9 +4,6 @@
|
|
# shellcheck disable=SC2317
|
|
check() {
|
|
|
|
- # Always include resume module
|
|
- return 0
|
|
-
|
|
swap_on_netdevice() {
|
|
local _dev
|
|
for _dev in "${swap_devs[@]}"; do
|
|
@@ -23,6 +20,9 @@ check() {
|
|
# hibernation support requested on kernel command line
|
|
return 0
|
|
else
|
|
+ # always include resume module when not on netdevice
|
|
+ return 0
|
|
+
|
|
# resume= not set on kernel command line
|
|
if [[ -f /sys/power/resume ]]; then
|
|
if [[ "$(< /sys/power/resume)" == "0:0" ]]; then
|
|
--
|
|
2.42.0
|
|
|