commit: eba3381a9d7039cf0a1d066299b1d40e91d23226
Author: FlyingWaffle <flyingwaffle <AT> pm <DOT> me>
AuthorDate: Sat May 28 20:32:49 2022 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat May 28 20:32:49 2022 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=eba3381a
Additional test to allow for hibernation resume...
...on a broader range of system configurations, including LVM and swapfiles.
Signed-off-by: FlyingWaffle <flyingwaffle <AT> pm.me>
defaults/linuxrc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5ee7804..9daad4a 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -671,7 +671,8 @@ keyctl_keyadd
if [ "${CDROOT}" != '1' ]
then
if ( [ -n "${CRYPT_SWAP_KEY}" ] && [ -z "${CRYPT_SWAP_KEYDEV}" ] ) || \
- ( [ -n "${CRYPT_SWAP_HEADER}" ] && [ -z "${CRYPT_SWAP_HEADERDEV}" ] )
+ ( [ -n "${CRYPT_SWAP_HEADER}" ] && [ -z "${CRYPT_SWAP_HEADERDEV}" ]
) || \
+ ( [ "${REAL_ROOT}" = "${REAL_RESUME}" ] || [ ${USE_LVM_NORMAL} -eq 1
] )
then
# the swap key or header might be on the root fs so start it
first in this case
start_LUKS_root
