diff options
| author |   FlyingWaffle <flyingwaffle@pm.me> | 2022-05-28 15:32:49 -0500 |
|---|---|---|
| committer | FlyingWaffle <flyingwaffle@pm.me> | 2022-05-28 15:32:49 -0500 |
| commit | eba3381a9d7039cf0a1d066299b1d40e91d23226 (patch) | |
| tree | 306f9fd93844268a0c0ab9c2f041ec3a707e8c4e | |
| parent | add keyctl support for loading LUKS passphrase into a keyring (diff) | |
| download | genkernel-eba3381a9d7039cf0a1d066299b1d40e91d23226.tar.gz genkernel-eba3381a9d7039cf0a1d066299b1d40e91d23226.tar.bz2 genkernel-eba3381a9d7039cf0a1d066299b1d40e91d23226.zip | |
Additional test to allow for hibernation resume...
...on a broader range of system configurations, including LVM and swapfiles.
Signed-off-by: FlyingWaffle <flyingwaffle@pm.me>
| -rw-r--r-- | defaults/linuxrc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/defaults/linuxrc b/defaults/linuxrc index 5ee78044..9daad4a4 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 |