Restore previous handling of real_root due to report of regressions (bug #419965)

This reverts commit f95264adde.

Conflicts:
	defaults/initrd.scripts

ChangeLog

@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  09 Jul 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts:
+  Restore previous handling of real_root due to report of regressions (bug
+  #419965)
+
   08 Jul 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.37
 

defaults/initrd.scripts

@@ -751,19 +751,16 @@ 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="$LUKS_NAME" 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=''