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

(-)initrd.scripts (+27 lines)
Lines 716-721 Link Here
716
			whereis "LUKS_KEYDEV" "${LUKS_NAME} key device"
716
			whereis "LUKS_KEYDEV" "${LUKS_NAME} key device"
717
			KEYDEV_ERROR=0
717
			KEYDEV_ERROR=0
718
		else
718
		else
719
			case "${LUKS_DEVICE}" in
720
				UUID\=*)
721
					REAL_LUKS=""
722
					retval=1
723
724
					if [ "${retval}" -ne '0' ]; then
725
						REAL_LUKS=`findfs "${LUKS_DEVICE}" 2>/dev/null`
726
						retval=$?
727
					fi
728
729
					if [ "$retval" -ne '0' ]; then
730
						REAL_LUKS=`busybox findfs "${LUKS_DEVICE}" 2>/dev/null`
731
						retval=$?
732
					fi
733
734
					if [ "${retval}" -ne '0' ]; then
735
						REAL_LUKS=`blkid -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null`
736
						retval=$?
737
					fi
738
739
					if [ "${retval}" -eq '0' ] && [ -n "${REAL_LUKS}" ]; then
740
						good_msg "Detected device ${REAL_LUKS}"
741
						LUKS_DEVICE="${REAL_LUKS}"
742
					fi
743
				;;
744
			esac
745
719
			setup_md_device ${LUKS_DEVICE}
746
			setup_md_device ${LUKS_DEVICE}
720
			cryptsetup isLuks ${LUKS_DEVICE}
747
			cryptsetup isLuks ${LUKS_DEVICE}
721
			if [ ! "$?" -eq '0' ]
748
			if [ ! "$?" -eq '0' ]

Return to bug 315467