[patch] initrd.scripts.diff

initrd.scripts.diff (text/plain), 1.87 KB, created by Marc Perrudin on 2011-08-07 22:03:54 UTC

--- initrd.scripts	2011-08-07 22:17:37.000000000 +0200
+++ initrd.scripts.new	2011-08-07 22:30:01.000000000 +0200
@@ -766,28 +766,9 @@
 		else
 			case "${LUKS_DEVICE}" in
 				UUID\=*|LABEL\=*)
-					local REAL_LUKS=""
-					local retval=1
-
-					if [ "${retval}" -ne 0 ]; then
-						REAL_LUKS=`findfs "${LUKS_DEVICE}" 2>/dev/null`
-						retval=$?
-					fi
-
-					if [ "$retval" -ne 0 ]; then
-						REAL_LUKS=`busybox findfs "${LUKS_DEVICE}" 2>/dev/null`
-						retval=$?
-					fi
-
-					if [ "${retval}" -ne 0 ]; then
-						REAL_LUKS=`blkid -l -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null`
-						retval=$?
-					fi
-
-					if [ "${retval}" -eq 0 ] && [ -n "${REAL_LUKS}" ]; then
-						good_msg "Detected device ${REAL_LUKS}"
-						LUKS_DEVICE="${REAL_LUKS}"
-					fi
+					local CONF_DEVICE="${LUKS_DEVICE}"
+					get_real_device
+					LUKS_DEVICE="${CONF_DEVICE}"
 				;;
 			esac
 
@@ -804,6 +785,14 @@
 				then
 					if [ ! -e "${mntkey}${LUKS_KEY}" ] 
 					then
+						case "${LUKS_KEYDEV}" in
+							UUID\=*|LABEL\=*)
+								local CONF_DEVICE="${LUKS_KEYDEV}"
+								get_real_device
+								LUKS_KEYDEV="${CONF_DEVICE}"
+							;;
+						esac
+						
 						if [ -b "${LUKS_KEYDEV}" ]
 						then good_msg "Using key device ${LUKS_KEYDEV}." ${CRYPT_SILENT}
 						else
@@ -1143,3 +1132,28 @@
 		USE_UNIONFS_NORMAL=0
 	fi
 }
+
+get_real_device() {
+	local REAL_DEVICE=""
+	local retval=1
+
+	if [ "${retval}" -ne 0 ]; then
+		REAL_DEVICE=`findfs "${CONF_DEVICE}" 2>/dev/null`
+		retval=$?
+	fi
+
+	if [ "$retval" -ne 0 ]; then
+		REAL_DEVICE=`busybox findfs "${CONF_DEVICE}" 2>/dev/null`
+		retval=$?
+	fi
+
+	if [ "${retval}" -ne 0 ]; then
+		REAL_DEVICE=`blkid -l -t "${CONF_DEVICE}" | cut -d ":" -f 1 2>/dev/null`
+		retval=$?
+	fi
+
+	if [ "${retval}" -eq 0 ] && [ -n "${REAL_DEVICE}" ]; then
+		good_msg "Detected device ${REAL_DEVICE}"
+		CONF_DEVICE="${REAL_DEVICE}"
+	fi
+}