--- genkernel-4.0.10.orig/defaults/initrd.scripts 2020-07-21 01:05:15.000000000 +0900 +++ genkernel-4.0.10.orig/defaults/initrd.scripts 2020-07-24 13:40:18.614274727 +0900 @@ -1821,6 +1821,12 @@ local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0 local mntkey="/mnt/key/" crypt_filter_ret= + if [ $2 -gt 0 ] + then + eval local LUKS_NAME="$1_$2" + eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}_$2"' + fi + while true do local cryptsetup_options='' @@ -2316,7 +2322,11 @@ if [ -n "${CRYPT_ROOT}" ] then - openLUKS "root" + local crypt_index=0 + for CRYPT_ROOT in ${CRYPT_ROOTS}; do + openLUKS "root" ${crypt_index} + let crypt_index=${crypt_index}+1 + done if [ -n "${REAL_ROOT}" ] then # Rescan volumes @@ -2366,6 +2376,7 @@ write_env_file \ "${CRYPT_ENV_FILE}" \ CRYPT_ROOT \ + CRYPT_ROOTS \ CRYPT_ROOT_TRIM \ CRYPT_SILENT \ CRYPT_SWAP --- genkernel-4.0.10.orig/defaults/linuxrc 2020-07-21 01:05:15.000000000 +0900 +++ genkernel-4.0.10.orig/defaults/linuxrc 2020-07-24 13:40:18.614274727 +0900 @@ -244,8 +244,9 @@ ISCSI_NOIBFT=1 ;; # Crypto - crypt_root=*) - CRYPT_ROOT=${x#*=} + crypt_root=*|crypt_roots=*) + CRYPT_ROOT=${CRYPT_ROOT:=${x#*=}} + CRYPT_ROOTS="${CRYPT_ROOTS} ${x#*=}" USE_CRYPTSETUP=1 ;; crypt_swap=*)