--- /home/volchok/rcscripts/dm-crypt-start.sh	2008-11-23 23:41:09.000000000 +0000
+++ /lib64/rcscripts/addons/dm-crypt-start.sh	2008-11-23 23:53:01.000000000 +0000
@@ -21,11 +21,11 @@
 		: ${options:=' '}
 	elif [ -n "$swap" ]; then
 		local foo
-		einfo "Checking swap is not LUKS"
-		cryptsetup isLuks ${source} 2>/dev/null >/dev/console </dev/console
+		einfo "Checking that swap partition does not contain a known file system"
+		blkid -s TYPE "${source}" 2>/dev/null >/dev/console </dev/console
 		foo="$?"
 		if [ "${foo}" -eq 0 ]; then
-		ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
+		ewarn "The swap partition that you have defined contains a recognizable file system. Aborting crypt-swap setup."
 		return
 		fi
 		target=${swap}