mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-03 05:18:29 +03:00
Skip sysinit test for cluster
Add #bin/bash to utils.sh and update fsadm test to current version of aux script
This commit is contained in:
parent
116cbc267c
commit
d6833cc7fa
@ -1,3 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
# Copyright (C) 2011 Red Hat, Inc. All rights reserved.
|
# Copyright (C) 2011 Red Hat, Inc. All rights reserved.
|
||||||
#
|
#
|
||||||
# This copyrighted material is made available to anyone wishing to use,
|
# This copyrighted material is made available to anyone wishing to use,
|
||||||
|
@ -38,7 +38,7 @@ test ! -d $mount_dir && mkdir $mount_dir
|
|||||||
cleanup_mounted_and_teardown()
|
cleanup_mounted_and_teardown()
|
||||||
{
|
{
|
||||||
umount $mount_dir || true
|
umount $mount_dir || true
|
||||||
teardown
|
aux teardown
|
||||||
}
|
}
|
||||||
|
|
||||||
fscheck_ext3()
|
fscheck_ext3()
|
||||||
@ -68,7 +68,7 @@ check_missing()
|
|||||||
|
|
||||||
# Test for block sizes != 1024 (rhbz #480022)
|
# Test for block sizes != 1024 (rhbz #480022)
|
||||||
lvcreate -n $lv1 -L20M $vg
|
lvcreate -n $lv1 -L20M $vg
|
||||||
trap 'aux cleanup_mounted_and_teardown' EXIT
|
trap 'cleanup_mounted_and_teardown' EXIT
|
||||||
|
|
||||||
if check_missing ext3; then
|
if check_missing ext3; then
|
||||||
mkfs.ext3 -b4096 -j $dev_vg_lv
|
mkfs.ext3 -b4096 -j $dev_vg_lv
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
which mkfs.ext3 || exit 200
|
which mkfs.ext3 || exit 200
|
||||||
|
|
||||||
aux prepare_pvs 2 8
|
aux prepare_pvs 2 8
|
||||||
|
test -e LOCAL_CLVMD && exit 200
|
||||||
|
|
||||||
var_lock="$DM_DEV_DIR/$vg1/$lv1"
|
var_lock="$DM_DEV_DIR/$vg1/$lv1"
|
||||||
# keep in sync with aux configured lockingdir
|
# keep in sync with aux configured lockingdir
|
||||||
|
Loading…
Reference in New Issue
Block a user