Commit a493292c authored by Mike Hibler's avatar Mike Hibler

Rearranging deck chairs.

Get rid of a noxious warning from the boot config when rc.healthd fails
because it is not supported on...well, just about anything.

Also noticed that the long dead nodetype script was about 10 years out of
date with respect to what nodes it recognized, so for some strange reason
I was compelled to fix it.

Leigh is about to get rid of these anyway, but I thought I would at least
screw up his merge!
parent 03a7f6ba
#!/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
#!/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
......
#!/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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment