diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2019-12-14 01:47:20 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2019-12-14 01:47:20 +0100 |
| commit | e0ee3888e7f008636c60f9536bddaf22bffb8b70 (patch) | |
| tree | acaccd7407767f695e9bd411e19678dc71aed41d | |
| parent | gkbuilds/thin-provisioning-tools: Add -j1 to avoid parallel install problem (diff) | |
| download | genkernel-e0ee3888e7f008636c60f9536bddaf22bffb8b70.tar.gz genkernel-e0ee3888e7f008636c60f9536bddaf22bffb8b70.tar.bz2 genkernel-e0ee3888e7f008636c60f9536bddaf22bffb8b70.zip | |
initrd.scripts: openLUKS(): Reset cryptsetup_options on each iteration
Bug: https://bugs.gentoo.org/702580
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rw-r--r-- | defaults/initrd.scripts | 4 | ||||
| -rw-r--r-- | defaults/unlock-luks.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 973a38aa..6acbbf68 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 457aa544..0f545047 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}" ] |