Add LABEL support to crypt_root, clean up UUID crypt_root patch

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 71f3550a0cc9d3bf8dd98c985d070b9c22931002..d1f105f1217be5ac1b765bd07569d7ee4e60f0e7 100755 (executable)
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -762,26 +762,26 @@ openLUKS() {
                        KEYDEV_ERROR=0
                else
                        case "${LUKS_DEVICE}" in
-                               UUID\=*)
-                                       REAL_LUKS=""
-                                       retval=1
+                               UUID\=*|LABEL\=*)
+                                       local REAL_LUKS=""
+                                       local retval=1
 
-                                       if [ "${retval}" -ne '0' ]; then
+                                       if [ "${retval}" -ne 0 ]; then
                                                REAL_LUKS=`findfs "${LUKS_DEVICE}" 2>/dev/null`
                                                retval=$?
                                        fi
 
-                                       if [ "$retval" -ne '0' ]; then
+                                       if [ "$retval" -ne 0 ]; then
                                                REAL_LUKS=`busybox findfs "${LUKS_DEVICE}" 2>/dev/null`
                                                retval=$?
                                        fi
 
-                                       if [ "${retval}" -ne '0' ]; then
+                                       if [ "${retval}" -ne 0 ]; then
                                                REAL_LUKS=`blkid -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null`
                                                retval=$?
                                        fi
 
-                                       if [ "${retval}" -eq '0' ] && [ -n "${REAL_LUKS}" ]; then
+                                       if [ "${retval}" -eq 0 ] && [ -n "${REAL_LUKS}" ]; then
                                                good_msg "Detected device ${REAL_LUKS}"
                                                LUKS_DEVICE="${REAL_LUKS}"
                                        fi