sipb-xen-remote-proxy: refactor argument parsing and passing

svn path=/trunk/packages/sipb-xen-remote-server/; revision=659

diff --git a/files/usr/sbin/sipb-xen-remote-proxy b/files/usr/sbin/sipb-xen-remote-proxy
index 91dceda..0f4f9e8 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-proxy
+++ b/files/usr/sbin/sipb-xen-remote-proxy
@@ -1,23 +1,24 @@
 #!/bin/sh
 # invoke as sipb-xen-remote-proxy-$TYPE, with "TYPE" in the remctl sense.
+
 klist -s || kinit -k host/remote.mit.edu
 
 TYPE="${0##*-}"
 case "$TYPE" in
     control )
-       SERVICE="$2" ;;
+       MACHINE="$1"; SERVICE="$2"; shift; shift ;;
     * )
-       SERVICE="$1" ;;
+       SERVICE="$1"; shift ;;
 esac
 
 case "$TYPE/$SERVICE" in
     web/listvms )
-       shift; sipb-xen-remote-listvms "$@" ;;
+       sipb-xen-remote-listvms "$@" ;;
     control/create )
-       remctl black-mesa remote "$TYPE" "$@" ;;
+       remctl black-mesa remote "$TYPE" "$MACHINE" "$SERVICE" "$@" ;;
     control/* )
        # Everything but create must go where the VM is already running.
-       sipb-xen-remote-control "$@" ;;
+       sipb-xen-remote-control "$MACHINE" "$SERVICE" "$@" ;;
     * )
-       remctl black-mesa remote "$TYPE" "$@" ;;
+       remctl black-mesa remote "$TYPE" "$SERVICE" "$@" ;;
 esac