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.0.orig/defaults/initrd.scripts (-1 / +12 lines)
Lines 1781-1786 Link Here
1781
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
1781
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
1782
	local mntkey="/mnt/key/" crypt_filter_ret=
1782
	local mntkey="/mnt/key/" crypt_filter_ret=
1783
1783
1784
	if [ $2 -gt 0 ]
1785
	then
1786
		eval local LUKS_NAME="$1_$2"
1787
		eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}_$2"'
1788
	fi
1789
1784
	while true
1790
	while true
1785
	do
1791
	do
1786
		local cryptsetup_options=''
1792
		local cryptsetup_options=''
Lines 2279-2285 Link Here
2279
2285
2280
	if [ -n "${CRYPT_ROOT}" ]
2286
	if [ -n "${CRYPT_ROOT}" ]
2281
	then
2287
	then
2282
		openLUKS "root"
2288
		local crypt_index=0
2289
		for CRYPT_ROOT in ${CRYPT_ROOTS}; do
2290
			openLUKS "root" ${crypt_index}
2291
			let crypt_index=${crypt_index}+1
2292
		done
2283
		if [ -n "${REAL_ROOT}" ]
2293
		if [ -n "${REAL_ROOT}" ]
2284
		then
2294
		then
2285
			# Rescan volumes
2295
			# Rescan volumes
Lines 2329-2334 Link Here
2329
	write_env_file \
2339
	write_env_file \
2330
		"${CRYPT_ENV_FILE}" \
2340
		"${CRYPT_ENV_FILE}" \
2331
		CRYPT_ROOT \
2341
		CRYPT_ROOT \
2342
		CRYPT_ROOTS \
2332
		CRYPT_ROOT_TRIM \
2343
		CRYPT_ROOT_TRIM \
2333
		CRYPT_SILENT \
2344
		CRYPT_SILENT \
2334
		CRYPT_SWAP
2345
		CRYPT_SWAP
(-)genkernel-4.1.0.orig/defaults/linuxrc (-2 / +3 lines)
Lines 242-249 Link Here
242
			ISCSI_NOIBFT=1
242
			ISCSI_NOIBFT=1
243
		;;
243
		;;
244
		# Crypto
244
		# Crypto
245
		crypt_root=*)
245
		crypt_root=*|crypt_roots=*)
246
			CRYPT_ROOT=${x#*=}
246
			CRYPT_ROOT=${CRYPT_ROOT:=${x#*=}}
247
			CRYPT_ROOTS="${CRYPT_ROOTS} ${x#*=}"
247
			USE_CRYPTSETUP=1
248
			USE_CRYPTSETUP=1
248
		;;
249
		;;
249
		crypt_swap=*)
250
		crypt_swap=*)

Return to bug 694778