Style fixes in, and Debian changelog for, list and listuser.

[invirt/packages/invirt-remote.git] / server / usr / sbin / invirt-remote-proxy

diff --git a/server/usr/sbin/invirt-remote-proxy b/server/usr/sbin/invirt-remote-proxy
index d64a7d1..f5c5248 100755 (executable)
--- a/server/usr/sbin/invirt-remote-proxy
+++ b/server/usr/sbin/invirt-remote-proxy
@@ -6,24 +6,21 @@ klist -s || kinit -k
 TYPE="${0##*-}"
 case "$TYPE" in
     control )
 TYPE="${0##*-}"
 case "$TYPE" in
     control )

-       MACHINE="$1"; SERVICE="$2"; shift; shift ;;
+        MACHINE="$1"; SERVICE="$2"; shift; shift ;;

     * )
     * )

-       SERVICE="$1"; shift ;;
+        SERVICE="$1"; shift ;;

 esac
 
 case "$TYPE/$SERVICE" in
     web/listvms )
 esac
 
 case "$TYPE/$SERVICE" in
     web/listvms )

-       invirt-remote-listvms "$@" ;;
+        invirt-remote-listvms "$@" ;;

     web/vnccert )
         invirt-remote-vnccert "$@" ;;
     web/vnccert )
         invirt-remote-vnccert "$@" ;;

-    web/availability )
+    web/availability | web/avail )

         invirt-remote-availability "$@" ;;
     web/lvcreate | web/lvremove | web/lvrename | web/lvresize )
         invirt-remote-availability "$@" ;;
     web/lvcreate | web/lvremove | web/lvrename | web/lvresize )

-        if [ -f "/etc/invirt/nolvm" ]; then
-            echo "LVM operations are temporarily disabled for maintenance, sorry." >&2
-            exit 2
-        fi
-        remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
+        invirt-remote-lvm "$SERVICE" "$@"
+        ;;

     control/help )
         invirt-remctl-help ;;
     control/create|control/install )
     control/help )
         invirt-remctl-help ;;
     control/create|control/install )

@@ -31,14 +28,14 @@ case "$TYPE/$SERVICE" in
             echo "Booting VMs is temporarily disabled for maintenance, sorry." >&2
             exit 2
         fi
             echo "Booting VMs is temporarily disabled for maintenance, sorry." >&2
             exit 2
         fi

-       invirt-remote-create "$SERVICE" "$MACHINE" "$@" ;;
+        invirt-remote-create "$SERVICE" "$MACHINE" "$@" ;;

     control/listhost|control/list-host )
     control/listhost|control/list-host )

-       invirt-remote-listhost "$MACHINE" "$@" ;;
+        invirt-remote-listhost "$MACHINE" "$@" ;;

     control/* )
     control/* )

-       # Everything but create must go where the VM is already running.
-       invirt-remote-control "$MACHINE" "$SERVICE" "$@" ;;
+        # Everything but create must go where the VM is already running.
+        invirt-remote-control "$MACHINE" "$SERVICE" "$@" ;;

     * )
     * )

-        echo "ERROR: invalid subcommand"
+        echo "ERROR: invalid subcommand $TYPE/$SERVICE"

         exit 34
         ;;
 esac
         exit 34
         ;;
 esac