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

Collapse All | Expand All

(-)initrd.scripts (+27 lines)
Lines 804-809 Link Here
804
				then
804
				then
805
					if [ ! -e "${mntkey}${LUKS_KEY}" ] 
805
					if [ ! -e "${mntkey}${LUKS_KEY}" ] 
806
					then
806
					then
807
						case "${LUKS_KEYDEV}" in
808
							UUID\=*|LABEL\=*)
809
								local REAL_KEYDEV=""
810
								local retval=1
811
812
								if [ "${retval}" -ne 0 ]; then
813
									REAL_KEYDEV=`findfs "${LUKS_KEYDEV}" 2>/dev/null`
814
									retval=$?
815
								fi
816
817
								if [ "$retval" -ne 0 ]; then
818
									REAL_KEYDEV=`busybox findfs "${LUKS_KEYDEV}" 2>/dev/null`
819
									retval=$?
820
								fi
821
822
								if [ "${retval}" -ne 0 ]; then
823
									REAL_KEYDEV=`blkid -l -t "${LUKS_KEYDEV}" | cut -d ":" -f 1 2>/dev/null`
824
									retval=$?
825
								fi
826
827
								if [ "${retval}" -eq 0 ] && [ -n "${REAL_KEYDEV}" ]; then
828
									good_msg "Detected device ${REAL_KEYDEV}"
829
									LUKS_KEYDEV="${REAL_KEYDEV}"
830
								fi
831
							;;
832
						esac
833
807
						if [ -b "${LUKS_KEYDEV}" ]
834
						if [ -b "${LUKS_KEYDEV}" ]
808
						then good_msg "Using key device ${LUKS_KEYDEV}." ${CRYPT_SILENT}
835
						then good_msg "Using key device ${LUKS_KEYDEV}." ${CRYPT_SILENT}
809
						else
836
						else

Return to bug 378105