From: Sebastian Pipping <sebastian@pipping.org>
Date: Sun, 16 Jan 2011 00:47:12 +0000 (+0100)
Subject: Propagate fix for ROOT_DEV from bug #303531 to RESUME_DEV and REAL_LUKS
X-Git-Tag: v3.4.11~5
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b56020daf608422b109155794cbffd6302b594e6;p=genkernel.git

Propagate fix for ROOT_DEV from bug #303531 to RESUME_DEV and REAL_LUKS
---

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 2d5fb5d..d74ed84 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -777,7 +777,7 @@ openLUKS() {
 					fi
 
 					if [ "${retval}" -ne 0 ]; then
-						REAL_LUKS=`blkid -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null`
+						REAL_LUKS=`blkid -l -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null`
 						retval=$?
 					fi
 
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 17a2f47..6ce8349 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -338,7 +338,7 @@ then
 				fi
 				
 				if [ ${retval} -ne 0 ]; then
-					RESUME_DEV=`blkid -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null`
+					RESUME_DEV=`blkid -l -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null`
 					retval=$?
 				fi