From 0fa71ef46ce917be19833f15293af5253a04f9e1 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 17 May 2012 20:22:02 +0200
Subject: [PATCH] Fix call to blkid of util-linux

---
 ChangeLog               | 4 ++++
 defaults/initrd.scripts | 2 +-
 defaults/linuxrc        | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83c2829..0173167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  17 May 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
+  Fix call to blkid as "blkid -l -t UUID=foo" (without -o device) does not seem
+  to work well with blkid of util-linux
+
   17 May 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
   Bump version to 3.4.33
 
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index c468ad4..258f2bd 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -801,7 +801,7 @@ openLUKS() {
 					fi
 
 					if [ "${retval}" -ne 0 ]; then
-						REAL_LUKS=`blkid -l -t "${LUKS_DEVICE}" | cut -d ":" -f 1 2>/dev/null`
+						REAL_LUKS=`blkid -o device -l -t "${LUKS_DEVICE}"`
 						retval=$?
 					fi
 
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6103e23..4ff5662 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -372,7 +372,7 @@ then
 				fi
 
 				if [ ${retval} -ne 0 ]; then
-					RESUME_DEV=$(blkid -l -t "${REAL_RESUME}" | cut -d ":" -f 1 2>/dev/null)
+					RESUME_DEV=$(blkid -o device -l -t "${REAL_RESUME}")
 					retval=$?
 				fi
 
@@ -480,7 +480,7 @@ do
 				fi
 
 				if [ ${retval} -ne 0 ]; then
-					ROOT_DEV=$(blkid -l -t "${REAL_ROOT}" | cut -d ":" -f 1 2>/dev/null)
+					ROOT_DEV=$(blkid -o device -l -t "${REAL_ROOT}")
 					retval=$?
 				fi
 
-- 
2.26.2