From 57670eeeb75621c887501886c67fdab541371624 Mon Sep 17 00:00:00 2001 From: Ondrej Kozina Date: Thu, 7 Feb 2019 11:00:19 +0100 Subject: [PATCH] Detect LUKS2 default alignmnet in align tests. --- tests/align-test2 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/align-test2 b/tests/align-test2 index 0dd767f4..bedc3dd6 100755 --- a/tests/align-test2 +++ b/tests/align-test2 @@ -9,8 +9,6 @@ PWD1="93R4P4pIqAH8" PWD2="mymJeD8ivEhE" FAST_PBKDF="--pbkdf pbkdf2 --pbkdf-force-iterations 1000" -EXPCT=32768 - cleanup() { udevadm settle >/dev/null 2>&1 if [ -d "$MNT_DIR" ] ; then @@ -164,6 +162,14 @@ dm_crypt_features modprobe --dry-run scsi_debug || exit 77 cleanup +add_device dev_size_mb=32 +echo $PWD1 | $CRYPTSETUP luksFormat $FAST_PBKDF --type luks2 $DEV -q >/dev/null || fail +EXPCT=$($CRYPTSETUP luksDump $DEV | grep "offset: " | cut -f 2 -d ' ') +test "$EXPCT" -gt 512 || fail +EXPCT=$((EXPCT/512)) +echo "Default alignment detected: $EXPCT sectors" +cleanup + echo "# Create desktop-class 4K drive" echo "# (logical_block_size=512, physical_block_size=4096, alignment_offset=0)" add_device dev_size_mb=32 sector_size=512 physblk_exp=3 num_tgts=1