From: Sebastian Pipping <sebastian@pipping.org>
Date: Mon, 9 Jul 2012 17:47:21 +0000 (+0200)
Subject: Restore previous handling of real_root due to report of regressions (bug #419965)
X-Git-Tag: v3.4.38~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=51dcb157423d660f652e44a795cfb9a51724ad1e;p=genkernel.git

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

This reverts commit f95264added35c25fb557931116edd3cd0aec7ba.

Conflicts:
	defaults/initrd.scripts
---

diff --git a/ChangeLog b/ChangeLog
index 42b6f7c..21e7fdb 100644
--- a/ChangeLog
+++ b/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
 
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f05a746..258f2bd 100755
--- a/defaults/initrd.scripts
+++ b/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=''