Index: /trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy
===================================================================
--- /trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy	(revision 658)
+++ /trunk/packages/sipb-xen-remote-server/files/usr/sbin/sipb-xen-remote-proxy	(revision 659)
@@ -1,4 +1,5 @@
 #!/bin/sh
 # invoke as sipb-xen-remote-proxy-$TYPE, with "TYPE" in the remctl sense.
+
 klist -s || kinit -k host/remote.mit.edu
 
@@ -6,18 +7,18 @@
 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