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.2.1.orig/defaults/initrd.scripts (-1 / +12 lines)
Lines 1843-1848 Link Here
1843
		exit 1
1843
		exit 1
1844
	fi
1844
	fi
1845
1845
1846
	if [ $2 -gt 0 ]
1847
	then
1848
		eval local LUKS_NAME="$1_$2"
1849
		eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}_$2"'
1850
	fi
1851
1846
	while true
1852
	while true
1847
	do
1853
	do
1848
		local gpg_cmd=""
1854
		local gpg_cmd=""
Lines 2344-2350 Link Here
2344
2350
2345
	if [ -n "${CRYPT_ROOT}" ]
2351
	if [ -n "${CRYPT_ROOT}" ]
2346
	then
2352
	then
2347
		openLUKS "root"
2353
		local crypt_index=0
2354
		for CRYPT_ROOT in ${CRYPT_ROOTS}; do
2355
			openLUKS "root" ${crypt_index}
2356
			let crypt_index=${crypt_index}+1
2357
		done
2348
		if [ -n "${REAL_ROOT}" ]
2358
		if [ -n "${REAL_ROOT}" ]
2349
		then
2359
		then
2350
			# Rescan volumes
2360
			# Rescan volumes
Lines 2394-2399 Link Here
2394
	write_env_file \
2404
	write_env_file \
2395
		"${CRYPT_ENV_FILE}" \
2405
		"${CRYPT_ENV_FILE}" \
2396
		CRYPT_ROOT \
2406
		CRYPT_ROOT \
2407
		CRYPT_ROOTS \
2397
		CRYPT_ROOT_OPTIONS \
2408
		CRYPT_ROOT_OPTIONS \
2398
		CRYPT_SILENT \
2409
		CRYPT_SILENT \
2399
		CRYPT_SWAP \
2410
		CRYPT_SWAP \
(-)genkernel-4.2.1.orig/defaults/linuxrc (-2 / +3 lines)
Lines 214-221 Link Here
214
			ISCSI_NOIBFT=1
214
			ISCSI_NOIBFT=1
215
		;;
215
		;;
216
		# Crypto
216
		# Crypto
217
		crypt_root=*)
217
		crypt_root=*|crypt_roots=*)
218
			CRYPT_ROOT=${x#*=}
218
			CRYPT_ROOT=${CRYPT_ROOT:=${x#*=}}
219
			CRYPT_ROOTS="${CRYPT_ROOTS} ${x#*=}"
219
			USE_CRYPTSETUP=1
220
			USE_CRYPTSETUP=1
220
		;;
221
		;;
221
		crypt_root_options=*)
222
		crypt_root_options=*)

Return to bug 694778