More merge conflicts

new

@@ -94,7 +94,7 @@ echo -n "Creating skeletal script for you to edit ..."
 
 cat <<End-of-File >$id
 #! /bin/sh
-# XFS QA Test No. $id
+# FS QA Test No. $id
 #
 # what am I here for?
 #
@@ -139,7 +139,13 @@ echo "QA output created by \$seq"
 here=\`pwd\`
 tmp=/tmp/\$\$
 status=1	# failure is the default!
-trap "rm -f \$tmp.*; exit \\\$status" 0 1 2 3 15
+trap "_cleanup; exit \\\$status" 0 1 2 3 15
+
+_cleanup()
+{
+    cd /
+    rm -f \$tmp.*
+}
 
 # get standard environment, filters and checks
 . ./common.rc
@@ -147,6 +153,10 @@ trap "rm -f \$tmp.*; exit \\\$status" 0 1 2 3 15
 
 # real QA test starts here
 
+# Modify as appropriate.
+_supported_fs xfs udf nfs
+_supported_os IRIX Linux
+
 # if error
 exit