diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2019-05-03 13:11:09 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2019-05-03 13:17:22 +0200 |
| commit | ac627fd1cec77a8334b7e48c3cb8f3efff50fb3c (patch) | |
| tree | 7ec71b5a683eb2a9670bfed6e3a248347b46869e | |
| parent | 8c56e31134baa5e7ddf8881e8a23d5ac5f2459a6 (diff) | |
| download | lvm2-ac627fd1cec77a8334b7e48c3cb8f3efff50fb3c.tar.gz | |
tests: use luks1 for test
Since we do not need anywhere luks2 - pick older format
which does not require password for resize to keep
the rest of test unmodified.
| -rw-r--r-- | test/shell/fsadm-crypt.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/shell/fsadm-crypt.sh b/test/shell/fsadm-crypt.sh index d90413d88..9c85edf8d 100644 --- a/test/shell/fsadm-crypt.sh +++ b/test/shell/fsadm-crypt.sh @@ -46,7 +46,14 @@ PWD2="mymJeD8ivEhE" PWD3="ocMakf3fAcQO" SKIP_DETACHED= -which cryptsetup || check_cryptsetup=${check_cryptsetup:-cryptsetup} +if which cryptsetup ; then + # use older format luks1 - otherwise the test would need to pass password everywhere... + case $(cryptsetup --version) in + "cryptsetup 2"*) FORMAT_PARAMS="$FORMAT_PARAMS --type luks1" ;; + esac +else + check_cryptsetup=${check_cryptsetup:-cryptsetup} +fi which mkfs.ext2 || check_ext2=${check_ext2:-mkfs.ext2} which mkfs.ext3 || check_ext3=${check_ext3:-mkfs.ext3} |