From 66bedfd8e4be84780bf9122d6e247ab76fe26586 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Mon, 1 Jul 2019 13:10:20 +0200 Subject: [PATCH] Fix LUKS2 reencryption recovery test. Detect properly the case when recovery actually completed encryption action for detached header case. --- tests/luks2-reencryption-test | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/luks2-reencryption-test b/tests/luks2-reencryption-test index 38992306..bcc256f5 100755 --- a/tests/luks2-reencryption-test +++ b/tests/luks2-reencryption-test @@ -400,12 +400,14 @@ function encrypt_recover_detached_online() { # $1 sector size, $2 resilience, $3 fix_writes $OVRDEV $OLD_DEV echo $PWD1 | $CRYPTSETUP open $DEV --header $4 $DEV_NAME || fail - $CRYPTSETUP status $DEV_NAME --header $4 | grep -q "reencryption: in-progress" || fail - check_hash_dev /dev/mapper/$DEV_NAME $3 - echo $PWD1 | $CRYPTSETUP reencrypt --active-name $DEV_NAME --resume-only --header $4 --resilience $2 -q || fail - check_hash_dev /dev/mapper/$DEV_NAME $3 + $CRYPTSETUP luksDump $4 | grep -q "online-reencrypt" + if [ $? -eq 0 ]; then + $CRYPTSETUP status $DEV_NAME --header $4 | grep -q "reencryption: in-progress" || fail + echo $PWD1 | $CRYPTSETUP reencrypt --active-name $DEV_NAME --resume-only --header $4 --resilience $2 -q || fail + check_hash_dev /dev/mapper/$DEV_NAME $3 + fi $CRYPTSETUP close $DEV_NAME || fail