Merge remote branch 'central/master'

tmcd/common/config/rc.config

@@ -164,7 +164,7 @@ sub doaction($@)
 	next
 	    if (!-x "$BINDIR/rc/$script");
 
-	runbootscript(\%manifest,"$BINDIR/rc",$script,$what,"$optarg $bargs");
+	runbootscript(\%manifest,"$BINDIR/rc",$script,$what,"$optarg $bargs $what");
     }
 }
 

tmcd/freebsd/nodetype

 #!/bin/sh
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2004 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
 . /etc/emulab/paths.sh
 
+# Why am I trying to fix this script!?
+if [ -r $BOOTDIR/nodeid -a -r $BOOTDIR/ltpmap ]; then
+    nid=`cat $BOOTDIR/nodeid`
+    nt=`grep $nid $BOOTDIR/ltpmap 2>/dev/null | awk "/^H/ { if (\\$3 == \"$nid\") print \\$5 }" 2>/dev/null`
+    if [ -n "$nt" ]; then
+	echo $nt
+	exit 0
+    fi
+fi
+
 # XXX for FreeBSD 5.x
 if [ ! -r /var/run/dmesg.boot ]; then
 	dmesg > /var/run/dmesg.boot
@@ -56,3 +66,5 @@ elif [ $cpuspeed = "2500" ]; then
 else
 	echo pc$cpuspeed;
 fi
+
+exit 0

tmcd/freebsd/rc.healthd

 #!/bin/sh
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2002, 2004 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
 . /etc/emulab/paths.sh
@@ -20,8 +20,8 @@ case "$1" in
 	    	#
 		# Not supported
 		#
-		echo "Health monitoring not supported on nodetype: $NODETYPE"
-		exit 1
+		echo "WARNING: health monitoring not supported on nodetype: $NODETYPE"
+		exit 0
 		;;
 	esac
 

tmcd/linux/nodetype

 #!/bin/sh
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2004 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
 . /etc/emulab/paths.sh
 
+# Why am I trying to fix this script!?
+if [ -r $BOOTDIR/nodeid -a -r $BOOTDIR/ltpmap ]; then
+    nid=`cat $BOOTDIR/nodeid`
+    nt=`grep $nid $BOOTDIR/ltpmap 2>/dev/null | awk "/^H/ { if (\\$3 == \"$nid\") print \\$5 }" 2>/dev/null`
+    if [ -n "$nt" ]; then
+	echo $nt
+	exit 0
+    fi
+fi
+
 if [ -x $BINDIR/cpuspeed.awk ]; then
 	cpuspeed=`$BINDIR/cpuspeed.awk /proc/cpuinfo`;
 else