[patch] dmcrypt-posix.patch

dmcrypt-posix.patch (text/plain), 1004 bytes, created by Khayyam on 2013-03-21 16:24:34 UTC

--- dmcrypt.orig	2013-02-24 01:22:10.996731365 +0100
+++ dmcrypt	2013-03-21 15:24:51.541748341 +0100
@@ -96,8 +96,8 @@
 		}
 
 		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key/*:/} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
-		key=${key/:*/}
+		mode=${key##*:} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
+		key=${key%%:*}
 		case "${mode}" in
 		gpg|reg)
 			# handle key on removable device
@@ -155,7 +155,7 @@
 	if [ "${mode}" = "gpg" ] ; then
 		: ${gpg_options:='-q -d'}
 		# gpg available ?
-		if type -p gpg >/dev/null ; then
+		if command -v gpg >/dev/null ; then
 			for i in 0 1 2 ; do
 				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
 				# save stdin stdout stderr "values"
@@ -255,7 +255,7 @@
 		esac
 	done
 
-	while read -u 3 targetline ; do
+	while read <&3 targetline ; do
 		case ${targetline} in
 		# skip comments and blank lines
 		""|"#"*) continue ;;