--- /afs/athena/system/config/tellme/arch/share/bin/tellme	2009-10-02 11:24:57.000000000 -0400
+++ /mit/geofft/debathena/tellme	2010-02-19 01:40:54.000000000 -0500
@@ -10,23 +10,26 @@
     exit 1
 fi
 
-while [ "$1" ]; do
-    case "$1" in
-
+case "$*" in
     root)
 	if [ -f /etc/athena/rc.conf ]; then
 	    . /etc/athena/rc.conf
+	fi
 
-	    if [ "${PUBLIC}" != "true" ]; then
-		if [ -x /etc/athena/dialuptype ]; then
-		    echo "Note: This is a dialup. It does not have the"
-		    echo "Athena root password."
-		else
-		    echo "Warning: This is a private workstation. It may not"
-		    echo "have the Athena root password."
-		fi
-		echo ""
+	case `machtype -L` in
+	debathena-cluster) PUBLIC=true ;;
+	debathena-*) PUBLIC=false ;;
+	esac
+
+	if [ -n "${PUBLIC}" ] && [ "${PUBLIC}" != "true" ]; then
+	    if [ -x /etc/athena/dialuptype ]; then
+		echo "Note: This is a dialup. It does not have the"
+		echo "Athena root password."
+	    else
+	    	echo "Warning: This is a private workstation. It may not"
+		echo "have the Athena root password."
 	    fi
+	    echo ""
 	fi
 
 	echo "Actions taken as root on MIT-owned machines may be recorded."
@@ -67,10 +70,12 @@
         echo "Red, no, blue...AAAAAAaaaaaaahhhhhhh"
 	;;
 
+    power\ level)
+	echo "It's over 9000!"
+	;;
+
     *)
 	echo "I don't know about "$1"."
 	;;
 
-    esac
-    shift
-done
+esac