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.3.orig/defaults/initrd.scripts (-1 / +12 lines)
Lines 1841-1846 Link Here
1841
		exit 1
1841
		exit 1
1842
	fi
1842
	fi
1843
1843
1844
	if [ $2 -gt 0 ]
1845
	then
1846
		eval local LUKS_NAME="$1_$2"
1847
		eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}_$2"'
1848
	fi
1849
1844
	while true
1850
	while true
1845
	do
1851
	do
1846
		# Reset cryptsetup_options on each iteration
1852
		# Reset cryptsetup_options on each iteration
Lines 2346-2352 Link Here
2346
2352
2347
	if [ -n "${CRYPT_ROOT}" ]
2353
	if [ -n "${CRYPT_ROOT}" ]
2348
	then
2354
	then
2349
		openLUKS "root"
2355
		local crypt_index=0
2356
		for CRYPT_ROOT in ${CRYPT_ROOTS}; do
2357
			openLUKS "root" ${crypt_index}
2358
			let crypt_index=${crypt_index}+1
2359
		done
2350
		if [ -n "${REAL_ROOT}" ]
2360
		if [ -n "${REAL_ROOT}" ]
2351
		then
2361
		then
2352
			# Rescan volumes
2362
			# Rescan volumes
Lines 2396-2401 Link Here
2396
	write_env_file \
2406
	write_env_file \
2397
		"${CRYPT_ENV_FILE}" \
2407
		"${CRYPT_ENV_FILE}" \
2398
		CRYPT_ROOT \
2408
		CRYPT_ROOT \
2409
		CRYPT_ROOTS \
2399
		CRYPT_ROOT_OPTIONS \
2410
		CRYPT_ROOT_OPTIONS \
2400
		CRYPT_SILENT \
2411
		CRYPT_SILENT \
2401
		CRYPT_SWAP \
2412
		CRYPT_SWAP \
(-)genkernel-4.2.3.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