commit: e0ee3888e7f008636c60f9536bddaf22bffb8b70 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat Dec 14 00:47:20 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat Dec 14 00:47:20 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e0ee3888
initrd.scripts: openLUKS(): Reset cryptsetup_options on each iteration Bug: https://bugs.gentoo.org/702580 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> defaults/initrd.scripts | 4 +++- defaults/unlock-luks.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 973a38a..6acbbf6 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1717,10 +1717,12 @@ openLUKS() { eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"' local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0 - local mntkey="/mnt/key/" crypt_filter_ret= cryptsetup_options='' + local mntkey="/mnt/key/" crypt_filter_ret= while true do + local cryptsetup_options='' + local gpg_cmd="" if [ -e "${OPENED_LOCKFILE}" ] then diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh index 457aa54..0f54504 100644 --- a/defaults/unlock-luks.sh +++ b/defaults/unlock-luks.sh @@ -45,10 +45,10 @@ main() { eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="${NAME}" LUKS_KEY='"${CRYPT_KEYFILE_'${TYPE}'}"' eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"' - local cryptsetup_options while true do + local cryptsetup_options="" local gpg_cmd crypt_filter_ret if [ -e "${OPENED_LOCKFILE}" ]
