From: Barry Naujok <bnaujok@sgi.com>
Date: Thu, 20 Nov 2008 14:23:38 +0000 (+0000)
Subject: xfstest: confirm mkfs.gfs[2] in test 032
X-Git-Tag: v1.1.0~350
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=89866a0dac460e3d97ffe2dd752036ccfbf0efa8;p=xfstests-dev.git

xfstest: confirm mkfs.gfs[2] in test 032

mkfs.gfs[2] asks for confirmation before mkfs'ing; without
this test 032 hangs when mkfs.gfs2 is present.

Also, mkfs.gfs needs a few more args to make it go.
Merge of master-melb:xfs-cmds:32510a by kenmcd.

  confirm mkfs.gfs[2] in test 032
---

diff --git a/032 b/032
index 5c23ebf2..97dd6223 100755
--- a/032
+++ b/032
@@ -43,6 +43,8 @@ do
 	[ $fs = vfat ] && postargs=2000
 	# these folks prompt before writing
 	[ $fs = jfs ] && preop="echo Y |"
+	[ $fs = gfs ] && preop="echo y |" && preargs="-p lock_nolock -j 1"
+	[ $fs = gfs2 ] && preop="echo y |"
 	[ $fs = reiserfs ] && preop="echo y |" && preargs="-f"
 	# cramfs mkfs requires a directory argument
 	[ $fs = cramfs ] && preargs=/proc/fs/xfs