diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2022-05-28 13:53:41 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2022-05-28 13:53:41 -0700 |
| commit | d244a241a7565b920ba0a30274fddc5c88ea0e8a (patch) | |
| tree | bba680cf9cf1f5b4e994cdbad89bcc5911f05dfa | |
| parent | Detached header: fix bootstrap calls and sleeps, remove extra bracket (diff) | |
| parent | Additional test to allow for hibernation resume... (diff) | |
| download | genkernel-d244a241a7565b920ba0a30274fddc5c88ea0e8a.tar.gz genkernel-d244a241a7565b920ba0a30274fddc5c88ea0e8a.tar.bz2 genkernel-d244a241a7565b920ba0a30274fddc5c88ea0e8a.zip | |
Additional test to allow for hibernation resume
Merges: https://github.com/gentoo/genkernel/pull/38
Closes: https://github.com/gentoo/genkernel/pull/38
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
| -rw-r--r-- | defaults/linuxrc | 3 |
1 files changed, 2 insertions, 1 deletions
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 |