From 96d67485d9f993ad365dec45de04fb4d8510f1cc Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 13 Jun 2011 16:45:09 +0000 Subject: [PATCH] Seems that dmsetup table is broken in recent lvm2, let's support "x: table" as well. git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@551 36d66b0a-2a48-0410-832c-cd162a569da5 --- tests/mode-test | 2 +- tests/password-hash-test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/mode-test b/tests/mode-test index ba6ac0aa..9a2ad8b4 100755 --- a/tests/mode-test +++ b/tests/mode-test @@ -51,7 +51,7 @@ add_device() { dmcrypt_check() # device outstring { - X=$(dmsetup table $1 2>/dev/null | cut -d' ' -f 4) + X=$(dmsetup table $1 2>/dev/null | sed 's/.*: //' | cut -d' ' -f 4) if [ $X = $2 ] ; then echo -n "[table OK]" else diff --git a/tests/password-hash-test b/tests/password-hash-test index e45f559b..5e3a3d81 100755 --- a/tests/password-hash-test +++ b/tests/password-hash-test @@ -63,7 +63,7 @@ crypt_key() # hash keysize pwd/file name outkey [limit] fi fi - VKEY=$(dmsetup table $DEV2 --showkeys 2>/dev/null | cut -d' ' -f 5) + VKEY=$(dmsetup table $DEV2 --showkeys 2>/dev/null | sed 's/.*: //' | cut -d' ' -f 5) if [ "$VKEY" != "$5" ] ; then echo " [FAILED]" echo "expected: $5"