From 763daca7d5d9d175bfec37f7795b60c4e56672a1 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 20 Oct 2013 11:22:52 +0200 Subject: [PATCH] 00-crypt.sh: start_luks: remove bogus sleep 6 calls. We expect to fix the issue at its root as soon as bugs come in. --- defaults/initrd.d/00-crypt.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/defaults/initrd.d/00-crypt.sh b/defaults/initrd.d/00-crypt.sh index 4a54cee..67aab6e 100755 --- a/defaults/initrd.d/00-crypt.sh +++ b/defaults/initrd.d/00-crypt.sh @@ -267,10 +267,9 @@ start_luks() { return 1 fi - # TODO(lxnay): this sleep 6 thing is hurting my eyes sooooo much. # if key is set but key device isn't, find it [ -n "${CRYPT_ROOT_KEY}" ] && [ -z "${CRYPT_ROOT_KEYDEV}" ] \ - && sleep 6 && _bootstrap_key "ROOT" + && _bootstrap_key "ROOT" if [ -n "${CRYPT_ROOTS}" ]; then if _open_luks "root"; then @@ -282,10 +281,9 @@ start_luks() { fi fi - # TODO(lxnay): this sleep 6 thing is hurting my eyes sooooo much. # same for swap, but no need to sleep if root was unencrypted [ -n "${CRYPT_SWAP_KEY}" ] && [ -z "${CRYPT_SWAP_KEYDEV}" ] \ - && { [ -z "${CRYPT_ROOTS}" ] && sleep 6; _bootstrap_key "SWAP"; } + && _bootstrap_key "SWAP" if [ -n "${CRYPT_SWAPS}" ]; then if _open_luks "swap"; then