From: Marios Andreopoulos <opensource@andmarios.com>
Date: Mon, 11 Jun 2012 17:17:49 +0000 (+0200)
Subject: Use real_root option for (plain) Luks setup
X-Git-Tag: v3.4.36~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f95264added35c25fb557931116edd3cd0aec7ba;p=genkernel.git

Use real_root option for (plain) Luks setup
---

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 258f2bd..fd9ac27 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -751,16 +751,19 @@ openLUKS() {
 	# please use 'tr' and this line, or remove it
 	# eval local TYPE=`uppercase $1`
 
+	local LUKS_NAME="$1"
+
 	case $1 in
 		root)
 			local TYPE=ROOT
+			[ -n "${REAL_ROOT}" ] && local LUKS_NAME="$(echo "$REAL_ROOT" | sed -e 's/.*\///')"
 			;;
 		swap)
 			local TYPE=SWAP
 			;;
 	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="$LUKS_NAME" 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=''