Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 694778 | Differences between
and this patch

Collapse All | Expand All

(-)genkernel-4.0.9.orig/defaults/initrd.scripts (-1 / +12 lines)
Lines 1769-1774 Link Here
1769
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
1769
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
1770
	local mntkey="/mnt/key/" crypt_filter_ret=
1770
	local mntkey="/mnt/key/" crypt_filter_ret=
1771
1771
1772
	if [ $2 -gt 0 ]
1773
	then
1774
		eval local LUKS_NAME="$1_$2"
1775
		eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}_$2"'
1776
	fi
1777
1772
	while true
1778
	while true
1773
	do
1779
	do
1774
		local cryptsetup_options=''
1780
		local cryptsetup_options=''
Lines 2264-2270 Link Here
2264
2270
2265
	if [ -n "${CRYPT_ROOT}" ]
2271
	if [ -n "${CRYPT_ROOT}" ]
2266
	then
2272
	then
2267
		openLUKS "root"
2273
		local crypt_index=0
2274
		for CRYPT_ROOT in ${CRYPT_ROOTS}; do
2275
			openLUKS "root" ${crypt_index}
2276
			let crypt_index=${crypt_index}+1
2277
		done
2268
		if [ -n "${REAL_ROOT}" ]
2278
		if [ -n "${REAL_ROOT}" ]
2269
		then
2279
		then
2270
			# Rescan volumes
2280
			# Rescan volumes
Lines 2314-2319 Link Here
2314
	write_env_file \
2324
	write_env_file \
2315
		"${CRYPT_ENV_FILE}" \
2325
		"${CRYPT_ENV_FILE}" \
2316
		CRYPT_ROOT \
2326
		CRYPT_ROOT \
2327
		CRYPT_ROOTS \
2317
		CRYPT_ROOT_TRIM \
2328
		CRYPT_ROOT_TRIM \
2318
		CRYPT_SILENT \
2329
		CRYPT_SILENT \
2319
		CRYPT_SWAP
2330
		CRYPT_SWAP
(-)genkernel-4.0.9.orig/defaults/linuxrc (-2 / +3 lines)
Lines 244-251 Link Here
244
			ISCSI_NOIBFT=1
244
			ISCSI_NOIBFT=1
245
		;;
245
		;;
246
		# Crypto
246
		# Crypto
247
		crypt_root=*)
247
		crypt_root=*|crypt_roots=*)
248
			CRYPT_ROOT=${x#*=}
248
			CRYPT_ROOT=${CRYPT_ROOT:=${x#*=}}
249
			CRYPT_ROOTS="${CRYPT_ROOTS} ${x#*=}"
249
			USE_CRYPTSETUP=1
250
			USE_CRYPTSETUP=1
250
		;;
251
		;;
251
		crypt_swap=*)
252
		crypt_swap=*)

Return to bug 694778