[patch] Updated patch to add master support to cryptsetup-luks.

dm-crypt-start.patch (text/plain), 2.24 KB, created by Joshua (RETIRED) on 2005-12-19 06:30:34 UTC

--- /usr/portage/sys-fs/cryptsetup-luks/files/dm-crypt-start.sh	2005-06-15 18:05:56.000000000 +0800
+++ /lib/rcscripts/addons/dm-crypt-start.sh	2005-12-15 17:08:10.000000000 +0800
@@ -6,6 +6,7 @@
 # Setup mappings for an individual mount/swap
 #
 # Note: This relies on variables localized in the main body below.
+
 dm-crypt-execute-checkfs() {
 	local dev target ret
 
@@ -40,12 +41,17 @@
 		eend ${ret} "failure running cryptsetup"
 	elif [[ -n ${type} ]] ; then
 		einfo "/bin/cryptsetup ${options} luksOpen ${source} ${target}" 
-		/bin/cryptsetup ${options} luksOpen ${source} ${target} >/dev/console </dev/console
+		if [[ -z ${master} ]] ; then
+		    /bin/cryptsetup ${options} luksOpen ${source} ${target} >/dev/console </dev/console
 		#/bin/cryptsetup ${options} luksOpen ${source} ${target} 
+		else
+		    echo ${master} | /bin/cryptsetup ${options} luksOpen ${source} ${target} >/dev/console
+		fi
 		ret=$?
 		eend ${ret} "failure running cryptsetup-luks"
 	elif [[ -n ${key} ]] ; then
 		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)
@@ -57,6 +63,11 @@
 				fi
 			done
 			eend ${ret}
+		    else
+			keystring=$(echo ${master} | gpg -q -d ${gpg_options} --passphrase-fd 0 ${key} 2>/dev/null)
+			echo ${keystring} | /bin/cryptsetup ${options} create ${target} ${source}
+			ret=0
+		    fi
 		else
 			einfo "You have to install app-crypt/gnupg first"
 		fi
@@ -132,7 +143,25 @@
 					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}"
 				;;
@@ -148,5 +177,4 @@
 	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
 fi
 
-
 # vim:ts=4