Fixed merge problems

068

@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 068
+# FS QA Test No. 068
 #
 # Test Linux LVM snapshot creation
 #
@@ -103,6 +103,10 @@ trap "_cleanup" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
+# real QA test starts here
+_supported_fs xfs
+_supported_os Linux
+
 if [ -e "$SCRATCH_SNAP_MNT" ]; then
 	rmdir "$SCRATCH_SNAP_MNT" || _notrun "Cannot rmdir $SCRATCH_SNAP_MNT"
 fi
@@ -134,8 +138,6 @@ if grep device-mapper /proc/devices > /dev/null; then LVM=true; fi
 [ "$LVM" = false ] && _notrun "LVM is not present in the running kernel."
 
 
-# real QA test starts here
-
 # Create a PV set from the scratch partition
 #TODO # (I don't know if this is needed.and it is dangerous because it intentionally deletes the partition table!!! 
 #TODO # dd if=/dev/zero of="$SCRATCH_LVM_DEV" bs=512 count=1