From d6833cc7fa4fdbf560694f5dbe5562ccbffae0c1 Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Mon, 31 Jan 2011 22:05:30 +0000
Subject: [PATCH] Skip sysinit test for cluster Add #bin/bash to utils.sh and
 update fsadm test to current version of aux script

---
 test/lib/utils.sh          | 1 +
 test/t-fsadm.sh            | 4 ++--
 test/t-vgchange-sysinit.sh | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/lib/utils.sh b/test/lib/utils.sh
index 7f9ec1313..69ae2afb1 100644
--- a/test/lib/utils.sh
+++ b/test/lib/utils.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 # Copyright (C) 2011 Red Hat, Inc. All rights reserved.
 #
 # This copyrighted material is made available to anyone wishing to use,
diff --git a/test/t-fsadm.sh b/test/t-fsadm.sh
index bda41d4b5..a539ccf3d 100644
--- a/test/t-fsadm.sh
+++ b/test/t-fsadm.sh
@@ -38,7 +38,7 @@ test ! -d $mount_dir && mkdir $mount_dir
 cleanup_mounted_and_teardown()
 {
 	umount $mount_dir || true
-	teardown
+	aux teardown
 }
 
 fscheck_ext3()
@@ -68,7 +68,7 @@ check_missing()
 
 # Test for block sizes != 1024 (rhbz #480022)
 lvcreate -n $lv1 -L20M $vg
-trap 'aux cleanup_mounted_and_teardown' EXIT
+trap 'cleanup_mounted_and_teardown' EXIT
 
 if check_missing ext3; then
 	mkfs.ext3 -b4096 -j $dev_vg_lv
diff --git a/test/t-vgchange-sysinit.sh b/test/t-vgchange-sysinit.sh
index c89882f69..a9f24780b 100755
--- a/test/t-vgchange-sysinit.sh
+++ b/test/t-vgchange-sysinit.sh
@@ -14,6 +14,7 @@
 which mkfs.ext3 || exit 200
 
 aux prepare_pvs 2 8
+test -e LOCAL_CLVMD && exit 200
 
 var_lock="$DM_DEV_DIR/$vg1/$lv1"
 # keep in sync with aux configured lockingdir