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 2d5fb5d1a3365262b4a490c40fd5e0749e37287c..d74ed846007894c0ba4ae682e478703e6c6289ac 100755 (executable)
--- 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 17a2f475295d3f58f01f5b33780190849ba9d7b1..6ce83497c54c269409901516ced22a4eba59520a 100755 (executable)
--- 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