[patch] genkernel kernel cmdline crypt_maps parameter list

genkernel-3.4.47_crypt_maps.patch (text/plain), 3.45 KB, created by Sebastian Glita on 2013-06-25 20:08:30 UTC

diff -ruN a/defaults/initrd.scripts b/defaults/initrd.scripts
--- a/defaults/initrd.scripts	2013-06-09 17:02:13.000000000 +0300
+++ b/defaults/initrd.scripts	2013-06-22 13:04:20.878024740 +0300
@@ -826,6 +826,7 @@
 # Open a LUKS device
 # It is either the root or a swap, other devices are supported in the scripts provided with sys-fs/cryptsetup-luks
 # $1 - root/swap
+# $1 - <[mapname:]device> pair, e.g., "usr:/dev/sda3" or "root:/dev/sda1"
 openLUKS() {
 	# please use 'tr' and this line, or remove it
 	# eval local TYPE=`uppercase $1`
@@ -833,13 +834,26 @@
 	case $1 in
 		root)
 			local TYPE=ROOT
+			[ -z "${REAL_ROOT}" ] || CRYPT_ROOT_OPEN='1'
+			;;
+		root:*)
+			local TYPE=ROOT
+			CRYPT_ROOT="${CRYPT_MAPS}"
+			REAL_ROOT="${1#*:}"
 			;;
 		swap)
 			local TYPE=SWAP
 			;;
+		*:*)
+			local TYPE=MAPS
+			;;
+		*)
+			bad_msg "List encrypted volumes as \`crypt_maps=<[mapname:]device>,...'" ${CRYPT_SILENT}
+			run_shell
+			;;
 	esac
 
-	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="$1" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
+	eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"' LUKS_NAME="${1%:*}" LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"' LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
 	local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0
 	local mntkey="/mnt/key/" cryptsetup_options=''
 
@@ -962,10 +976,10 @@
 
 				if [ ${crypt_filter_ret} -eq 0 ]
 				then
-					good_msg "LUKS device ${LUKS_DEVICE} opened" ${CRYPT_SILENT}
+					good_msg "LUKS device ${LUKS_DEVICE} (\"${LUKS_NAME}\") opened" ${CRYPT_SILENT}
 					break
 				else
-					bad_msg "Failed to open LUKS device ${LUKS_DEVICE}" ${CRYPT_SILENT}
+					bad_msg "Failed to open LUKS device ${LUKS_DEVICE} (\"${LUKS_NAME}\")" ${CRYPT_SILENT}
 					DEV_ERROR=1
 					KEY_ERROR=1
 					KEYDEV_ERROR=1
@@ -977,6 +991,29 @@
 	rmdir -p ${mntkey} 2>/dev/null >/dev/null
 }
 
+# volumes `crypt_maps' syntax: a comma separated list of <mapname:device> pairs,
+# where <mapname> and <device> are from `cryptsetup luksOpen <device> <mapname>'
+# if missing, <mapname> defaults to "root"; as in these examples:
+# 1.1 crypt_root=/dev/sda1
+# 1.1 crypt_maps=/dev/sda1
+# 1.2 crypt_maps=root:/dev/sda1
+# 2.1 crypt_maps=root:/dev/sda1,usr:/dev/sda3
+# 3.1 crypt_maps=usr:/dev/sda3,/dev/sda1,big:/dev/sdb1,xxl:/dev/sdc1
+iterLUKS() {
+	local pair
+	for pair in $*
+	do
+		[ -n "${pair#*:}" -a -n "${pair%:*}" ] || continue
+
+		CRYPT_MAPS="${pair#*:}"
+		CRYPT_MAPS_KEY="${CRYPT_ROOT_KEYDEV:+/${pair%:*}key}"
+		CRYPT_MAPS_KEYDEV="${CRYPT_ROOT_KEYDEV}"
+
+		[ "${pair#*:}" != "${pair}" ] || openLUKS "root"
+		[ "${pair%:*}" == "${pair}" ] || openLUKS "${pair}"
+	done
+}
+
 startLUKS() {
 
 	# if key is set but key device isn't, find it
@@ -985,7 +1022,10 @@
 		&& sleep 6 && bootstrapKey "ROOT"
 
 	if [ -n "${CRYPT_ROOT}" ]; then
-		openLUKS "root"
+		CRYPT_ROOT_OPEN='0'
+		[ "${CDROOT}" == '1' ] && openLUKS "root"
+		[ "${CDROOT}" == '1' ] || iterLUKS "${MAPLIST}"
+		[ "${CRYPT_ROOT_OPEN}" == '1' ] || openLUKS "root"
 		if [ -n "${REAL_ROOT}" ]
 		then
 			# Rescan volumes
diff -ruN a/defaults/linuxrc b/defaults/linuxrc
--- a/defaults/linuxrc	2013-06-09 17:02:13.000000000 +0300
+++ b/defaults/linuxrc	2013-06-22 13:04:20.891025113 +0300
@@ -210,6 +210,10 @@
 		crypt_swap=*)
 			CRYPT_SWAP=${x#*=}
 		;;
+		crypt_maps=*)
+			MAPLIST=${x#*=}
+			MAPLIST="$(echo ${MAPLIST} | sed -e 's/,/ /g')"
+		;;
 		root_key=*)
 			CRYPT_ROOT_KEY=${x#*=}
 		;;