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

[genkernel.git] / defaults / initrd.scripts

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index f05a746cf70fc1af08a64a20a7777dee11e5ba3d..258f2bd0ebe6e429f581f7eee531d2ac00980e15 100755 (executable)
--- 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=''