r2000 - trunk/utils/initrd-tools

Martin Michlmayr tbm@haydn.debian.org
Wed, 15 Dec 2004 06:12:39 -0700


Author: tbm
Date: 2004-12-15 06:12:11 -0700 (Wed, 15 Dec 2004)
New Revision: 2000

Modified:
   trunk/utils/initrd-tools/mkinitrd
Log:
make the grep more reliable


Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2004-12-15 13:09:38 UTC (rev 1999)
+++ trunk/utils/initrd-tools/mkinitrd	2004-12-15 13:12:11 UTC (rev 2000)
@@ -403,7 +403,7 @@
 	fi
 	
 	dmname=$(dmsetup ls | grep "$dmdev\$" | sed 's/^\([^[:space:]]*\).*$/\1/')
-	if dmsetup table $dmname | grep -q crypt; then
+	if dmsetup table $dmname | cut -d" " -f3 | grep -q ^crypt$ ; then
 		dmcrypt
 	elif command -v lvmiopversion > /dev/null 2>&1; then
 		lvm