[patch] Patch for dm-crypt-start.sh to add master capability.

dm-crypt-start.sh.patch (text/plain), 2.03 KB, created by Joshua (RETIRED) on 2005-10-12 05:41:29 UTC

*** dm-crypt-start.sh.orig	2005-10-12 19:34:53.228882048 +0800
--- dm-crypt-start.sh	2005-10-12 19:37:31.662796432 +0800
***************
*** 38,47 ****
--- 38,48 ----
  		/bin/cryptsetup ${options} create ${target} ${source} >/dev/console </dev/console
  		ret=$?
  		eend ${ret} "failure running cryptsetup"
  	else
  		if type -p gpg >/dev/null ; then
+ 		    if [[ -z ${master} ]] ; then
  			ret=1
  			while [[ ${ret} -gt 0 ]] ; do
  				keystring=$(gpg ${gpg_options} ${key} 2>/dev/null </dev/console)
  				if [[ -z ${keystring} ]] ; then
  					ret=5
***************
*** 50,59 ****
--- 51,65 ----
  					ret=$?
  				fi
  			done
  			eend ${ret}
  		else
+ 			#  Got a master passphrase.
+ 			keystring=$(echo ${master} | gpg -q -d ${gpg_options} --passphrase-fd 0 ${key} 2>/dev/null)
+ 			echo ${keystring} | /bin/cryptsetup ${options} create ${target} ${source}
+ 		    fi
+ 		else
  			einfo "You have to install app-crypt/gpg first"
  		fi
  	fi
  	splash svc_input_end checkfs
  
***************
*** 124,134 ****
  				if [[ -z ${mount} && -z ${swap} ]] ; then
  					ewarn "Ignoring setting outside mount/swap section: ${mountline}"
  					continue
  				fi
  				;;
! 
  			*)
  				ewarn "Skipping invalid line in /etc/conf.d/cryptfs: ${mountline}"
  				;;
  		esac
  
--- 130,158 ----
  				if [[ -z ${mount} && -z ${swap} ]] ; then
  					ewarn "Ignoring setting outside mount/swap section: ${mountline}"
  					continue
  				fi
  				;;
! 		    master_key=*)
! 		    if [[ "${myservice}" = "checkfs" ]] ; then
! 			if type -p gpg >/dev/null ; then
! 			    ret=1
! 			    while [[ ${ret} -gt 0 ]] ; do
! 			    # Get the master passphrase. 
! 				ret=0
! 				eval "${mountline}"
! 				master=$(gpg -d -q ${gpg_options} ${master_key}  2>/dev/null </dev/console)
! 				if [[ -z ${master} ]] ; then
! 				    ret=5
! 				fi
! 			    done
! 			    eend ${ret}
! 			else
! 			    einfo "You have to install app-crypt/gpg first"
! 			fi
! 		    fi
! 		    ;;
  			*)
  				ewarn "Skipping invalid line in /etc/conf.d/cryptfs: ${mountline}"
  				;;
  		esac