Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 315467 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/share/genkernel/defaults/initrd.scripts (-2 / +10 lines)
Lines 643-650 Link Here
643
			local TYPE=SWAP
643
			local TYPE=SWAP
644
			;;
644
			;;
645
	esac
645
	esac
646
646
	
647
	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
647
	# This adds support for LABEL and UUID in crypt_root and crypt_swap kernel options
648
	eval local Luks_Dev='"${CRYPT_'${TYPE}'}"'
649
	case $Luks_Dev in
650
		LABEL* | UUID*)
651
				Luks_Dev=$(blkid -t $Luks_Dev | cut -d  ":" -f 1 2>/dev/null)
652
				;;
653
	esac
654
	LUKS_DEVICE=${Luks_Dev} 
655
	eval local LUKS_NAME="$1" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"'
648
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
656
	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
649
	local mntkey="/mnt/key/" cryptsetup_options=''
657
	local mntkey="/mnt/key/" cryptsetup_options=''
650
658

Return to bug 315467