From: наб <nabijaczleweli@nabijaczleweli.xyz>
Date: Mon, 2 Jan 2023 15:48:14 +0000 (+0100)
Subject: feat(resume): also consider resume= in the cmdline as enabling hibernation
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3a7112bef794e2f2dd741ec2c74fa9cb9117651;p=thirdparty%2Fdracut.git

feat(resume): also consider resume= in the cmdline as enabling hibernation

Don't consider noresume to disable, that's a single-boot flag

Closes #924
---

diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
index 5e8910489..d25510336 100755
--- a/modules.d/95resume/module-setup.sh
+++ b/modules.d/95resume/module-setup.sh
@@ -13,7 +13,7 @@ check() {
     # Only support resume if hibernation is currently on
     # and no swap is mounted on a net device
     [[ $hostonly ]] || [[ $mount_needs ]] && {
-        swap_on_netdevice || [[ -f /sys/power/resume && "$(cat /sys/power/resume)" == "0:0" ]] && return 255
+        swap_on_netdevice || [[ -f /sys/power/resume && "$(< /sys/power/resume)" == "0:0" ]] || grep -rq '^\|[[:space:]]resume=' /proc/cmdline /etc/cmdline /etc/cmdline.d /etc/kernel/cmdline /usr/lib/kernel/cmdline 2> /dev/null && return 255
     }
 
     return 0