[Pkg-loop-aes-commits] r1333 - /trunk/loop-aes-utils/debian/loop-aes-keygen

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Dec  2 16:07:20 2006
New Revision: 1333

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1333
Log:
Use plain "grep -q" in multikey check, thanks Lionel

Modified:
    trunk/loop-aes-utils/debian/loop-aes-keygen

Modified: trunk/loop-aes-utils/debian/loop-aes-keygen
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/loop-aes-keygen?rev=1333&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/loop-aes-keygen (original)
+++ trunk/loop-aes-utils/debian/loop-aes-keygen Sat Dec  2 16:07:20 2006
@@ -147,8 +147,10 @@
 		match="multi-key";;
 	3)
 		match="multi-key-v3";;
+	*)
+		return 1;;
 	esac
-	grep -q -a "$match" /sbin/losetup
+	grep -q "$match" /sbin/losetup
 }
 
 keygen()
@@ -192,10 +194,8 @@
 	exit 1
 fi
 
-if [ "$version" -gt 1 ] && [ -x /usr/bin/strings ]; then
-	if ! check_multikey_support $version; then
-		echo "Warning: /sbin/losetup too old for v$version keys."
-	fi
+if ! check_multikey_support $version; then
+	echo "Warning: /sbin/losetup too old for v$version keys."
 fi
 
 if [ -e $keyfile ]; then