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.10.orig/defaults/initrd.scripts (-1 / +12 lines)
Lines 1821-1826 Link Here
1821
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
1821
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
1822
	local mntkey="/mnt/key/" crypt_filter_ret=
1822
	local mntkey="/mnt/key/" crypt_filter_ret=
1823
1823
1824
	if [ $2 -gt 0 ]
1825
	then
1826
		eval local LUKS_NAME="$1_$2"
1827
		eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}_$2"'
1828
	fi
1829
1824
	while true
1830
	while true
1825
	do
1831
	do
1826
		local cryptsetup_options=''
1832
		local cryptsetup_options=''
Lines 2316-2322 Link Here
2316
2322
2317
	if [ -n "${CRYPT_ROOT}" ]
2323
	if [ -n "${CRYPT_ROOT}" ]
2318
	then
2324
	then
2319
		openLUKS "root"
2325
		local crypt_index=0
2326
		for CRYPT_ROOT in ${CRYPT_ROOTS}; do
2327
			openLUKS "root" ${crypt_index}
2328
			let crypt_index=${crypt_index}+1
2329
		done
2320
		if [ -n "${REAL_ROOT}" ]
2330
		if [ -n "${REAL_ROOT}" ]
2321
		then
2331
		then
2322
			# Rescan volumes
2332
			# Rescan volumes
Lines 2366-2371 Link Here
2366
	write_env_file \
2376
	write_env_file \
2367
		"${CRYPT_ENV_FILE}" \
2377
		"${CRYPT_ENV_FILE}" \
2368
		CRYPT_ROOT \
2378
		CRYPT_ROOT \
2379
		CRYPT_ROOTS \
2369
		CRYPT_ROOT_TRIM \
2380
		CRYPT_ROOT_TRIM \
2370
		CRYPT_SILENT \
2381
		CRYPT_SILENT \
2371
		CRYPT_SWAP
2382
		CRYPT_SWAP
(-)genkernel-4.0.10.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