diff options
| author | Ondrej Kozina <okozina@redhat.com> | 2017-10-10 15:45:15 +0200 |
|---|---|---|
| committer | Ondrej Kozina <okozina@redhat.com> | 2017-10-10 15:47:04 +0200 |
| commit | e61313843f835284303141bd514fcbcb08fb2463 (patch) | |
| tree | 205843e78227fcf0ab6ff81aa5672625e2910b9e | |
| parent | 59145715f12c65bca68d28bd7e04e660752d6760 (diff) | |
| download | lvm2-e61313843f835284303141bd514fcbcb08fb2463.tar.gz | |
test: fsadm-crypt.sh fixes
use conservative 'luksOpen' command instead
fix reiserfs tests on plain crypt devices
| -rw-r--r-- | test/shell/fsadm-crypt.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/shell/fsadm-crypt.sh b/test/shell/fsadm-crypt.sh index 7f7f3a1c1..348b0ce9b 100644 --- a/test/shell/fsadm-crypt.sh +++ b/test/shell/fsadm-crypt.sh @@ -130,7 +130,7 @@ crypt_format() { # $3 name crypt_open() { local kname= - echo "$2" | cryptsetup open "$1" "$3" + echo "$2" | cryptsetup luksOpen "$1" "$3" test -L "$DM_DEV_DIR/mapper/$3" || { kname=$(get_crypt_kname $3) ln -s "$DM_DEV_DIR/$kname" "$3" @@ -144,7 +144,7 @@ crypt_open() { # $4 header crypt_open_detached() { local kname= - echo "$2" | cryptsetup open --header "$4" "$1" "$3" + echo "$2" | cryptsetup luksOpen --header "$4" "$1" "$3" test -L "$DM_DEV_DIR/mapper/$3" || { kname=$(get_crypt_kname $3) ln -s "$DM_DEV_DIR/$kname" "$3" @@ -402,8 +402,8 @@ test_reiserfs_plain() { not lvreduce -L-10M -r $1 fscheck_reiserfs "$3" - fsadm --cryptresize resize $3 30M - fsadm --cryptresize resize $3 35M + fsadm -y --cryptresize resize $3 30M + fsadm -y --cryptresize resize $3 35M fscheck_reiserfs "$3" crypt_close "$4" |