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.1.2.orig/defaults/initrd.scripts (-1 / +12 lines)
Lines 1795-1800 Link Here
1795
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
1795
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
1796
	local mntkey="/mnt/key/" crypt_filter_ret=
1796
	local mntkey="/mnt/key/" crypt_filter_ret=
1797
1797
1798
	if [ $2 -gt 0 ]
1799
	then
1800
		eval local LUKS_NAME="$1_$2"
1801
		eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}_$2"'
1802
	fi
1803
1798
	while true
1804
	while true
1799
	do
1805
	do
1800
		local cryptsetup_options=''
1806
		local cryptsetup_options=''
Lines 2296-2302 Link Here
2296
2302
2297
	if [ -n "${CRYPT_ROOT}" ]
2303
	if [ -n "${CRYPT_ROOT}" ]
2298
	then
2304
	then
2299
		openLUKS "root"
2305
		local crypt_index=0
2306
		for CRYPT_ROOT in ${CRYPT_ROOTS}; do
2307
			openLUKS "root" ${crypt_index}
2308
			let crypt_index=${crypt_index}+1
2309
		done
2300
		if [ -n "${REAL_ROOT}" ]
2310
		if [ -n "${REAL_ROOT}" ]
2301
		then
2311
		then
2302
			# Rescan volumes
2312
			# Rescan volumes
Lines 2346-2351 Link Here
2346
	write_env_file \
2356
	write_env_file \
2347
		"${CRYPT_ENV_FILE}" \
2357
		"${CRYPT_ENV_FILE}" \
2348
		CRYPT_ROOT \
2358
		CRYPT_ROOT \
2359
		CRYPT_ROOTS \
2349
		CRYPT_ROOT_TRIM \
2360
		CRYPT_ROOT_TRIM \
2350
		CRYPT_SILENT \
2361
		CRYPT_SILENT \
2351
		CRYPT_SWAP
2362
		CRYPT_SWAP
(-)genkernel-4.1.2.orig/defaults/linuxrc (-2 / +3 lines)
Lines 243-250 Link Here
243
			ISCSI_NOIBFT=1
243
			ISCSI_NOIBFT=1
244
		;;
244
		;;
245
		# Crypto
245
		# Crypto
246
		crypt_root=*)
246
		crypt_root=*|crypt_roots=*)
247
			CRYPT_ROOT=${x#*=}
247
			CRYPT_ROOT=${CRYPT_ROOT:=${x#*=}}
248
			CRYPT_ROOTS="${CRYPT_ROOTS} ${x#*=}"
248
			USE_CRYPTSETUP=1
249
			USE_CRYPTSETUP=1
249
		;;
250
		;;
250
		crypt_swap=*)
251
		crypt_swap=*)

Return to bug 694778