We do use "$2 and so on" in invirt-vmcontrol

[invirt/packages/invirt-remote.git] / files / usr / sbin / invirt-vmcontrol

diff --git a/files/usr/sbin/invirt-vmcontrol b/files/usr/sbin/invirt-vmcontrol
index bb3006b..70bff12 100755 (executable)
--- 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.
 #
 #
 # $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"
 
 ORIGMACHINE="$1"
 ACTION="$2"

@@ -17,17 +16,13 @@ case "$ACTION" in
     list|vcpu-list|uptime)
         xm "$ACTION" "$MACHINE"
        ;;
     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 &
        ;;
        xm "$ACTION" "$MACHINE"
        /usr/sbin/invirt-update-conserver </dev/null >/dev/null 2>&1 &
        ;;

-    install|create|reboot)
+    install|create)

        shift; shift;
        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 invirt-database machine_name="$ORIGMACHINE" installer_options="$(printf '%q ' "$@")"
        elif [ -n "$1" ]; then
        if [ "$ACTION" = "install" ]; then
            xm create invirt-database machine_name="$ORIGMACHINE" installer_options="$(printf '%q ' "$@")"
        elif [ -n "$1" ]; then

@@ -40,6 +35,9 @@ case "$ACTION" in
     list-long)
        xm list --long "$MACHINE"
        ;;
     list-long)
        xm list --long "$MACHINE"
        ;;

+    vnctoken)
+        invirt-vnc-authtoken "$ORIGMACHINE"
+        ;;

     *)
         echo "ERROR: Invalid Command"
         exit 34
     *)
         echo "ERROR: Invalid Command"
         exit 34