Fix call to blkid of util-linux

diff --git a/ChangeLog b/ChangeLog
index 83c2829812784bf1484197e4ffe2fce5619949c5..0173167cf72bc923dc20b3a61216cb5c1f4c69d7 100644 (file)
--- 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 c468ad4ef845c922651787193b1729d1ea7f1b86..258f2bd0ebe6e429f581f7eee531d2ac00980e15 100755 (executable)
--- 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 6103e23e8e0aa7d2a9bb0745de8f6943cdf28cd1..4ff56625fd4a579fc44bbd14838ec0e8c6045787 100755 (executable)
--- 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