Add LABEL support to crypt_root, clean up UUID crypt_root patch

defaults/initrd.scripts

@@ -762,26 +762,26 @@ openLUKS() {
 			KEYDEV_ERROR=0
 		else
 			case "${LUKS_DEVICE}" in
-				UUID\=*)
+				UUID\=*|LABEL\=*)
-					REAL_LUKS=""
+					local REAL_LUKS=""
-					retval=1
+					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