eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 11:50:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Silence repeated device removal in verity test.

Browse Source
This commit is contained in:
Milan Broz
2015-07-02 08:13:42 +02:00
parent 1a50fee1d0
commit a57f1b1b64
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/verity-compat-test
View File

@@ -9,7 +9,7 @@ IMG_HASH=verity-hash
function remove_mapping() function remove_mapping()
{ {
[ -b /dev/mapper/$DEV_NAME ] && dmsetup remove $DEV_NAME [ -b /dev/mapper/$DEV_NAME ] && dmsetup remove $DEV_NAME >/dev/null 2>&1
[ ! -z "$LOOPDEV1" ] && losetup -d $LOOPDEV1 >/dev/null 2>&1 [ ! -z "$LOOPDEV1" ] && losetup -d $LOOPDEV1 >/dev/null 2>&1
rm -f $IMG $IMG_HASH $DEV_OUT >/dev/null 2>&1 rm -f $IMG $IMG_HASH $DEV_OUT >/dev/null 2>&1
LOOPDEV1="" LOOPDEV1=""
@@ -102,7 +102,7 @@ function check_root_hash() # $1 size, $2 hash, $3 salt, $4 version, $5 hash, [$6
dmsetup status $DEV_NAME | grep "verity V" >/dev/null || fail dmsetup status $DEV_NAME | grep "verity V" >/dev/null || fail
echo -n "[in-kernel verify]" echo -n "[in-kernel verify]"
$VERITYSETUP remove $DEV_NAME || fail $VERITYSETUP remove $DEV_NAME >/dev/null 2>&1 || fail
case $fail in case $fail in
data) data)
@@ -126,7 +126,7 @@ function check_root_hash() # $1 size, $2 hash, $3 salt, $4 version, $5 hash, [$6
dd if=/dev/mapper/$DEV_NAME of=/dev/null bs=$1 2>/dev/null dd if=/dev/mapper/$DEV_NAME of=/dev/null bs=$1 2>/dev/null
dmsetup status $DEV_NAME | grep "verity V" >/dev/null && \ dmsetup status $DEV_NAME | grep "verity V" >/dev/null && \
fail "in-kernel check for $TXT corruption" fail "in-kernel check for $TXT corruption"
$VERITYSETUP remove $DEV_NAME || fail "deactivation" $VERITYSETUP remove $DEV_NAME >/dev/null 2>&1 || fail "deactivation"
echo "[$TXT corruption]" echo "[$TXT corruption]"
done done
done done