From f5547a519fee9b43a1e5022601810da9af8e64f4 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Sat, 15 Jan 2011 17:58:05 +0100
Subject: [PATCH] Add LABEL support to crypt_root, clean up UUID crypt_root patch

---
 defaults/initrd.scripts |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 71f3550..d1f105f 100755
--- 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
-- 
1.7.4.rc1