Attachment #6928 for bug #32981

View | Details | Raw Unified | Return to bug 32981
Collapse All | Expand All




	if [ -n "${LUKS_KEY-}" ]; then
		findkey "$nameluks"
		readkey "$nameluks" |
			cryptsetup --allow-discards -d- luksOpen "$LUKS_ROOT" "$nameluks"
	else
		rc=2
		while [ "$rc" = 2 ]; do
			cryptsetup --allow-discards -d- luksOpen "$LUKS_ROOT" "$nameluks"
			rc="$?"
		done
	fi
- 

Return to bug 32981

Lines 63-73 handler() { Link Here

(-)a/data/lib/initrd/handlers/050-luks (-3 / +2 lines)
63	if [ -n "${LUKS_KEY-}" ]; then	63	if [ -n "${LUKS_KEY-}" ]; then
64	findkey "$nameluks"	64	findkey "$nameluks"
65	readkey "$nameluks" \|	65	readkey "$nameluks" \|
66	cryptsetup -d- luksOpen "$LUKS_ROOT" "$nameluks"	66	cryptsetup --allow-discards -d- luksOpen "$LUKS_ROOT" "$nameluks"
67	else	67	else
68	rc=2	68	rc=2
69	while [ "$rc" = 2 ]; do	69	while [ "$rc" = 2 ]; do
70	cryptsetup -d- luksOpen "$LUKS_ROOT" "$nameluks"	70	cryptsetup --allow-discards -d- luksOpen "$LUKS_ROOT" "$nameluks"
71	rc="$?"	71	rc="$?"
72	done	72	done
73	fi	73	fi
74	-