X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/f49ea039fd343632043b11177d806cba5d055312..437a816b13b6701cdafc6fb7363324bd60a7efbe:/files/usr/sbin/invirt-vmcontrol

diff --git a/files/usr/sbin/invirt-vmcontrol b/files/usr/sbin/invirt-vmcontrol
index b5c1d9c..70bff12 100755
--- a/files/usr/sbin/invirt-vmcontrol
+++ b/files/usr/sbin/invirt-vmcontrol
@@ -6,8 +6,7 @@
 #
 # $0 and $1 come from the trusted remctl source.
 #
-# $2 and so on are user-provided, and thus sketchy.  I don't think we
-# need them for this script.
+# $2 and so on are user-provided, and thus sketchy.
 
 ORIGMACHINE="$1"
 ACTION="$2"
@@ -17,29 +16,28 @@ case "$ACTION" in
     list|vcpu-list|uptime)
         xm "$ACTION" "$MACHINE"
 	;;
-    destroy|shutdown)
+    destroy|shutdown|reboot)
 	xm "$ACTION" "$MACHINE"
 	/usr/sbin/invirt-update-conserver </dev/null >/dev/null 2>&1 &
 	;;
-    install|create|reboot)
+    install|create)
 	shift; shift;
-	if [ "$ACTION" = "reboot" ]; then
-	    xm destroy "$MACHINE" 2>/dev/null
-	else
-	    xm list "$MACHINE" >/dev/null 2>/dev/null && echo "$MACHINE already exists" && exit 1
-	fi
+	xm list "$MACHINE" >/dev/null 2>/dev/null && echo "$MACHINE already exists" && exit 1
 	if [ "$ACTION" = "install" ]; then
-	    xm create sipb-database machine_name="$ORIGMACHINE" installer_options="$(printf '%q ' "$@")"
+	    xm create invirt-database machine_name="$ORIGMACHINE" installer_options="$(printf '%q ' "$@")"
 	elif [ -n "$1" ]; then
-	    xm create sipb-database machine_name="$ORIGMACHINE" cdrom_image="$1"
+	    xm create invirt-database machine_name="$ORIGMACHINE" cdrom_image="$1"
 	else
-	    xm create sipb-database machine_name="$ORIGMACHINE"
+	    xm create invirt-database machine_name="$ORIGMACHINE"
 	fi
 	(sleep 4; /usr/sbin/invirt-update-conserver) </dev/null >/dev/null 2>&1 &
 	;;
     list-long)
 	xm list --long "$MACHINE"
 	;;
+    vnctoken)
+        invirt-vnc-authtoken "$ORIGMACHINE"
+        ;;
     *)
         echo "ERROR: Invalid Command"
         exit 34