Index: user/pho/stress2/default.cfg
===================================================================
--- user/pho/stress2/default.cfg	(revision 297919)
+++ user/pho/stress2/default.cfg	(revision 297920)
@@ -1,130 +1,134 @@
 # $FreeBSD$
 
-# Stress Test Suite Configuration
+# Stress Test Suite Configuration.
 
+# Changes should be added to a `hostname` file in this directory.
+# As a minimum you must updated "testuser".
+
+hostname=`hostname`	# Name of the local configuration file
+
 # Default values
 export RUNDIR=${RUNDIR:-/tmp/stressX}
 export RUNTIME=${RUNTIME:-2m}
 export VERBOSE=${VERBOSE:-1}
-export LOAD=20
+export LOAD=${LOAD:-20}
 
-# The INCARNATIONS variable should be set to match the number of CPUs and
+# The INCARNATIONS variable may be set to match the number of CPUs and
 # the amount of RAM in the test box.
-# 10  for a 1,8 GHz Celeron with 256 Mb of RAM
-# 100 for a dual Xeon 1,8 GHz with 1024 Gb of RAM
-
 export INCARNATIONS=${INCARNATIONS:-20}
 
-# Change hostname!
-#export BLASTHOST=192.168.1.2	# host with udp discard enabled in inetd.conf
-export BLASTHOST=192.168.1.3	# host with udp discard enabled in inetd.conf
-#export nfs_export=somehost:mount	# Used by nfs tests
+export BLASTHOST=192.168.1.1		# host with udp discard enabled in inetd.conf
+#export nfs_export=somehost:mount	# Used by the NFS tests
 
 # Run all test cases:
-export runRUNTIME=${runRUNTIME:-3d}		# Run tests for three days
+export runRUNTIME=${runRUNTIME:-3d}	# Run tests for three days
 export runINCARNATIONS=1
 export runLOAD=100
 
 export swapINCARNATIONS=${swapINCARNATIONS:-$((2 * INCARNATIONS))}
-export swapLOAD=80
+export swapLOAD=${swapLOAD:-80}
 
 export syscallKILL=1
-export swapKILL=1	# May takes a long time to stop
+export swapKILL=1			# May takes a long time to stop
 
-export rwLOAD=70
-export mkdirLOAD=80
-export creatLOAD=80
+export rwLOAD=${rwLOAD:-70}
+export mkdirLOAD=${mkdirLOAD:-80}
+export creatLOAD=${creatLOAD:-80}
 
-export symlinkLOAD=20
+export symlinkLOAD=20}
 
 export tcpKILL=1
-#export shmKILL=1
-export shmINCARNATIONS=5
+export shmINCARNATIONS=${shmINCARNATIONS:-5}
 
-export TESTPROGS="
+[ -z "$TESTPROGS" ] && export TESTPROGS="
 testcases/rw/rw
 testcases/swap/swap
 testcases/creat/creat
 testcases/mkdir/mkdir
 testcases/thr1/thr1
 testcases/udp/udp
 testcases/tcp/tcp
 "
 
 #
 # Defaults for ./misc tests
 #
 
-diskimage=/var/tmp/diskimage	# Location of 1G disk image
-mntpoint=/mnt			# Disk image mount point
-testuser=pho			# Name of non root test user
-mdstart=5			# Start of free md units
-part=a				# partition to use on a md FS
-newfs_flags="-U"		# default file system flags
+export diskimage=${diskimage:-/tmp/diskimage}	# Location of 1G disk image
+export mntpoint=${mntpoint:-/mnt}		# Disk image mount point
+export testuser=${testuser:-TBD}		# Name of non root test user
+export mdstart=${mdstart:-5}			# Start of free md units
+export part=${part:-a}				# Partition to use on a md FS
+export newfs_flags=${newfs_flags:-"-U"}		# Default file system flags
 export stress2origin=${stress2origin:-`pwd`}
+export stress2tools=`dirname $stress2origin`/tools
 
 # Wrapper for dd
 dede () {        # file, blocksize, count
    local log=/tmp/$0.$$
    dd if=/dev/zero of=$1 bs=$2 count=$3 > $log 2>&1
    local status=$?
    egrep -v "records in|records out|bytes transferred" $log
    rm -f $log
    return $status
 }
 
 # fsck and dumpfs comparison
 checkfs () {
    dumpfs $1 | sed '/UFS2/s/..:..:../xx:xx:xx/' > /tmp/dumpfs.1
    sleep 1
    fsck -t ufs -y $1 > /tmp/fsck.log 2>&1
    dumpfs $1 | sed '/UFS2/s/..:..:../xx:xx:xx/' > /tmp/dumpfs.2
    if egrep -q "INCONSISTENCY|MODIFIED" /tmp/fsck.log ||
      ! cmp -s /tmp/dumpfs.1 /tmp/dumpfs.2; then
       diff -c /tmp/dumpfs.1 /tmp/dumpfs.2
       echo "fsck -t ufs -y $1"
       cat /tmp/fsck.log
    else
       rm -f /tmp/fsck.log /tmp/dumpfs.[12]
    fi
 }
 
 # Support for pre-build binaries for stress2/misc tests
 # Build modes:
 # 1	Build and copy binary to $STRESS2BIN
 # 2	Do not compile; use binary from $STRESS2BIN
 
 # Examples:
 # BMODE=1 ./all.sh -on `grep -lw mycc *.sh`
 # BMODE=2 STRESS2BIN=/home/pho/stress2/bin.i386.r276368 ./all.sh
 
 CC=${CC:-cc}
 top=`dirname $(pwd)`	# cwd for the all.sh script
 STRESS2BIN=${STRESS2BIN:-$top/bin}
 mycc () {	# "-o" must be first argument
-	local file;
+	local file
 
 	[ "$1" = "-o" ] && file=`basename $2`
 	if [ "$BMODE" = "1" ]; then
 		$CC $@ || return
 		[ -z "$file" ] && return	# "-c"
 		[ -d $STRESS2BIN ] || mkdir $STRESS2BIN
 		[ -x $STRESS2BIN/$file ] &&
 		    echo "Overwriting $STRESS2BIN/$file"
 		echo "cp $2 $STRESS2BIN"
 		cp $2 $STRESS2BIN
 	elif [ "$BMODE" = "2" ]; then
 		[ -z "$file" ] && return
 		if [ ! -x $STRESS2BIN/$file ]; then
 			echo "$STRESS2BIN/$file not found"
 			exit 1
 		fi
 		echo "Using binary $STRESS2BIN/$file"
 		cp $STRESS2BIN/$file /tmp
 	else
 		$CC $@	# default "build and run" mode
 	fi
 }
 
-[ -f  "./`hostname`" ] && .  "./`hostname`"	# source in local configuration
-[ -f "../`hostname`" ] && . "../`hostname`"	# source in local configuration
+[ -f  "./$hostname" ] && .  "./$hostname"	# Source in local configuration
+[ -f "../$hostname" ] && . "../$hostname"	# Source in local configuration
+
+id $testuser > /dev/null 2>&1 ||
+    { echo "Non-root \$testuser \"$testuser\" not found." \
+    "Defined in stress2/default.cfg."; exit 1; }