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