diff -rNBu cryptsetup-1.1.3//debian/initramfs/cryptroot-hook cryptsetup-1.1.4//debian/initramfs/cryptroot-hook
--- cryptsetup-1.1.3//debian/initramfs/cryptroot-hook	2010-11-04 02:03:27.000000000 +0100
+++ cryptsetup-1.1.4//debian/initramfs/cryptroot-hook	2011-05-17 19:29:19.225951757 +0200
@@ -181,11 +181,16 @@
 	key=$( echo $opt | cut -d " " -f3 )
 	rootopts=$( echo $opt | cut -d " " -f4- )
 
-	if [ -z "$opt" ] || [ -z "$source" ] || [ -z "$key" ] || [ -z "$rootopts" ]; then
-		echo "cryptsetup: WARNING: invalid line in /etc/crypttab - $opt" >&2
+	if [ -z "$opt" ]; then
+		echo "cryptsetup: INFO: mapped volume $target has no line in /etc/crypttab" >&2
 		return 1
 	fi
 
+        if [ -z "$source" ] || [ -z "$key" ] || [ -z "$rootopts" ]; then
+                echo "cryptsetup: WARNING: invalid line in /etc/crypttab - $opt" >&2
+                return 1
+        fi
+
 	# Sanity checks for $source
 	if [ -h "$source" ]; then
 		link=$(readlink -nqe "$source")
@@ -297,7 +302,7 @@
 
 canonical_device() {
 	local dev altdev original
-	dev="$1"
+	dev=$(eval echo "$1")
 
 	altdev="${dev#LABEL=}"
 	if [ "$altdev" != "$dev" ]; then