Tweak bench script output format

diff --git a/bench b/bench
index 0e5bca63f6c52ad558fffe3908cd8f08116508a4..a90755510f71064ff27b81c3782d67fbb4e2aa67 100755 (executable)
--- a/bench
+++ b/bench
@@ -163,23 +163,29 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _require_scratch
 rm -f bench.* results.*
 
-_full_platform_details()
+_full_fstyp_details()
 {
     [ -z "$FSTYP" ] && FSTYP=xfs
+    echo $FSTYP
+}
+
+_full_platform_details()
+{
     os=`uname -s`
     host=`hostname -s`
     kernel=`uname -r`
     platform=`uname -i`
-
-    echo "$os/$platform $host $kernel [FSTYP=$FSTYP]"
+    echo "$os/$platform $host $kernel"
 }
 
+FULL_FSTYP_DETAILS=`_full_fstyp_details`
 FULL_HOST_DETAILS=`_full_platform_details`
 FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
 FULL_MOUNT_OPTIONS=`_scratch_mount_options`
 
 # $OUT is the report which will ultimately be sent, keep it tidy.
 cat >$OUT <<EOF
+FSTYP         -- $FULL_FSTYP_DETAILS
 PLATFORM      -- $FULL_HOST_DETAILS
 MKFS_OPTIONS  -- $FULL_MKFS_OPTIONS
 MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS