--- a/smoketest.sh	Sat Oct 10 12:08:59 2009 -0500
+++ b/smoketest.sh	Sun Oct 11 01:56:04 2009 -0500
@@ -3,31 +3,17 @@
 . sources/functions.sh || exit 1
 
 # This script compiles stuff under the final system, using distcc to call out
-# to the cross compiler.
-
-# Set up a timeout.  If it doesn't complete in 60 seconds, it failed.
-
-timeout()
-{
-  sleep 60
-  kill $1
-}
-
-timeout $$ &
-trap "killtree $$" EXIT
-
-# Call run-from-build with a here document to do stuff.
+# to the cross compiler.  It calls run-from-build with a here document.
 
 # Note that the first line of the script is a few spaces followed by a comment
-# character.  This gives some harmless data for the linux boot process to
-# consume and discard before it gets to the command prompt.  I don't know why
-# it does this, but it does.  The comment character is so you can see how
-# much got eaten, generally about 3 characters.
+# character.  This gives some harmless data for the linux boot process (serial
+# initialization) to consume and discard before it gets to the command prompt.
+# (The comment character is just so you can see how much got eaten.)
 
 # If you cat your own script into emulator-build.sh, you probably also need
 # to start with a line of spaces like that.  Just FYI.
 
-SKIP_HOME=1 ./run-from-build.sh $1 << 'EOF'
+SKIP_HOME=1 sources/timeout.sh 60 ./run-from-build.sh $1 << 'EOF'
           #
 # Show free space
 df