Index: /trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol
===================================================================
--- /trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol	(revision 195)
+++ /trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol	(revision 196)
@@ -1,4 +1,4 @@
 #!/bin/sh
-# dispatch-ACTION.sh MACHINE
+# sipb-xen-vmcontrol MACHINE ACTION
 #
 # remctl should have already verified that the user is authorized to
@@ -10,21 +10,18 @@
 # need them for this script.
 
-ACTION=$(echo "$0" | awk -F'.' '{print $2}')
 ORIGMACHINE="$1"
+ACTION="$2"
 MACHINE="d_$ORIGMACHINE"
 
 case "$ACTION" in
-    list|vcpu-list|destroy|create|uptime|shutdown)
+    list|vcpu-list|destroy|uptime|shutdown)
         xm "$ACTION" "$MACHINE"
 	;;
-    reboot-with-cdrom)
-	xm shutdown "$MACHINE"
-	xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$2"
-	;;
-    reboot)
-	if [ -n "$2" ]; then
-	    /usr/sbin/dispatch.reboot-with-cdrom.sh "$ORIGMACHINE" "$2" &
+    reboot|create|vmboot)
+	xm destroy "$MACHINE" 2>/dev/null
+	if [ -n "$3" ]; then
+	    xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$3"
 	else
-	    xm reboot "$MACHINE"
+	    xm create sipb-database machine_name="$ORIGMACHINE"
 	fi
 	;;