Whoops - I should actually check code after I write it; fix the new RemConfFS

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-remote-proxy

diff --git a/files/usr/sbin/sipb-xen-remote-proxy b/files/usr/sbin/sipb-xen-remote-proxy
index cb81f08..c94a764 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-proxy
+++ b/files/usr/sbin/sipb-xen-remote-proxy
@@ -1,18 +1,26 @@
-#!/bin/sh
+#!/bin/bash
 # invoke as sipb-xen-remote-proxy-$TYPE, with "TYPE" in the remctl sense.
-klist -s || kinit -k host/remote.mit.edu
+
+klist -s || kinit -k
 
 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 )
+       sipb-xen-remote-create "$MACHINE" "$@" ;;
+    control/listhost )
+       sipb-xen-remote-listhost "$MACHINE" "$@" ;;
+    control/* )
+       # Everything but create must go where the VM is already running.
+       sipb-xen-remote-control "$MACHINE" "$SERVICE" "$@" ;;
     * )
-       remctl black-mesa remote "$TYPE" "$@" ;;
+       remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
 esac