diff --git a/test/shell/vgcfgbackup-lvm1.sh b/test/shell/vgcfgbackup-lvm1.sh index a148ec1de..9b81e28c2 100644 --- a/test/shell/vgcfgbackup-lvm1.sh +++ b/test/shell/vgcfgbackup-lvm1.sh @@ -28,7 +28,7 @@ aux lvmconf "backup/backup = 0" # vgcfgbackup correctly stores metadata LVM1 with missing PVs pvcreate -M1 "${DEVICES[@]}" -vgcreate $SHARED -M1 -c n "$vg" "${DEVICES[@]}" +vgcreate $SHARED -M1 "$vg" "${DEVICES[@]}" lvcreate -l1 -n $lv1 $vg "$dev1" pvremove -ff -y "$dev2" not lvcreate -l1 -n $lv1 $vg "$dev3" diff --git a/test/shell/vgchange-usage.sh b/test/shell/vgchange-usage.sh index 1885a6458..9fe9bc593 100644 --- a/test/shell/vgchange-usage.sh +++ b/test/shell/vgchange-usage.sh @@ -101,7 +101,7 @@ vgremove -ff $vg test -n "$LVM_TEST_LVMLOCKD" && exit 0 # set cluster bit -vgcreate -cn $vg "$dev1" "$dev2" "$dev3" +vgcreate $vg "$dev1" "$dev2" "$dev3" # check prompt to change cluster bit without giving explicit vg name fail vgchange -cy 2>&1 | tee out grep "y/n" out @@ -121,10 +121,10 @@ if test -e LOCAL_CLVMD ; then # check we do not support conversion of just locally active LVs lvchange -an $vg lvchange -ay $vg - not vgchange -cn $vg + not vgchange $vg lvchange -an $vg lvchange -aey $vg - vgchange -cn $vg + vgchange $vg else # no clvmd is running fail vgchange -cy $vg @@ -136,7 +136,7 @@ else vgs --ignoreskippedcluster $vg 2>&1 | tee out not grep "Skipping clustered volume group" out # reset back to non-clustered VG with disabled locking - vgchange -cn $vg --config 'global{locking_type=0}' $vg + vgchange $vg --config 'global{locking_type=0}' $vg fi check vg_attr_bit cluster $vg "-" diff --git a/test/shell/vgsplit-usage.sh b/test/shell/vgsplit-usage.sh index a112e8621..38f3964c5 100644 --- a/test/shell/vgsplit-usage.sh +++ b/test/shell/vgsplit-usage.sh @@ -96,9 +96,9 @@ grep "Volume group \"$vg2\" exists, but new VG option specified" err vgremove $vg1 $vg2 # vgsplit rejects split because clustered given with existing vg -vgcreate -M$mdatype --clustered n $vg1 "$dev1" "$dev2" -vgcreate -M$mdatype --clustered n $vg2 "$dev3" "$dev4" -not vgsplit --clustered n $vg1 $vg2 "$dev1" 2>err +vgcreate -M$mdatype $vg1 "$dev1" "$dev2" +vgcreate -M$mdatype $vg2 "$dev3" "$dev4" +not vgsplit $vg1 $vg2 "$dev1" 2>err grep "Volume group \"$vg2\" exists, but new VG option specified" err vgremove $vg1 $vg2