[patch] plain diff

dmcrypt.luks_header.patch (text/plain), 1.58 KB, created by Oleg Akimov on 2013-12-08 19:26:40 UTC

60c60
< 	local arg1="create" arg2="${target}" arg3="${source}" luks=0
---
> 	local arg1="create" arg2="${target}" arg3="${source}" luks=0 arg_header=""
62c62,74
< 	cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="${source}"; arg3="${target}"; luks=1; }
---
> 	# luks_header force luks mode
> 	if [ -n "${luks_header}" ] ; then
> 		if [ ! -e "${luks_header}" ] ; then
> 			ewarn "${source} will not be decrypted ..."
> 			einfo "Reason: header file ${luks_header} does not exist."
> 			return
> 		fi
> 		arg1="luksOpen"; arg2="${source}"; arg3="${target}";
> 		arg_header="--header ${luks_header}"; luks=1;
> 	else
> 		cryptsetup isLuks ${source} 2>/dev/null \
> 			&& { arg1="luksOpen"; arg2="${source}"; arg3="${target}"; luks=1; }
> 	fi
158c170
< 	ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3}"
---
> 	ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3} ${arg_header}"
166c178,179
< 				gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
---
> 				gpg ${gpg_options} ${key} 2>/dev/null \
> 					| cryptsetup ${options} ${arg1} ${arg2} ${arg3} ${arg_header}
179c192
< 			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
---
> 			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3} ${arg_header}
183c196
< 			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
---
> 			cryptsetup ${options} ${arg1} ${arg2} ${arg3} ${arg_header}
283c296
< 		gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
---
> 		gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*|luks_header=*)