Fix Nelson's other request - make both "list-host" and "listhost"

valid commands, and document "list-host" for parity with "list-long"

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

diff --git a/debian/changelog b/debian/changelog
index 910bbfe..8d0fb11 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sipb-xen-remote-server (0.10.1) unstable; urgency=low
+
+  * Make both list-host and listhost valid commands, and for parity with
+    list-long, document list-host
+
+ -- Evan Broder <broder@mit.edu>  Wed, 22 Oct 2008 00:36:32 -0400
+

 sipb-xen-remote-server (0.10) unstable; urgency=low
 
   * If a command is invalid, but the machine's on, give an actually useful
 sipb-xen-remote-server (0.10) unstable; urgency=low
 
   * If a command is invalid, but the machine's on, give an actually useful

diff --git a/files/usr/sbin/sipb-xen-remctl-help b/files/usr/sbin/sipb-xen-remctl-help
index 4f71e99..2295f77 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remctl-help
+++ b/files/usr/sbin/sipb-xen-remctl-help
@@ -7,7 +7,7 @@ from invirt.config import structs as config
 
 help = [
     ('list',      'show your VM\'s state (with xm list)'),
 
 help = [
     ('list',      'show your VM\'s state (with xm list)'),

-    ('listhost',  'show on what host, if any, your VM is running'),
+    ('list-host',  'show on what host, if any, your VM is running'),

     ('list-long', 'show your VM\'s state as an sexp (with xm list --long)'),
     ('vcpu-list', 'show your VM\'s state (with xm vcpu-list)'),
     ('uptime',    'show your VM\'s state (with xm uptime)'),
     ('list-long', 'show your VM\'s state as an sexp (with xm list --long)'),
     ('vcpu-list', 'show your VM\'s state (with xm vcpu-list)'),
     ('uptime',    'show your VM\'s state (with xm uptime)'),

diff --git a/files/usr/sbin/sipb-xen-remote-proxy b/files/usr/sbin/sipb-xen-remote-proxy
index 9d7d0bd..983d524 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote-proxy
+++ b/files/usr/sbin/sipb-xen-remote-proxy
@@ -16,7 +16,7 @@ case "$TYPE/$SERVICE" in
        sipb-xen-remote-listvms "$@" ;;
     control/create|control/install )
        sipb-xen-remote-create "$SERVICE" "$MACHINE" "$@" ;;
        sipb-xen-remote-listvms "$@" ;;
     control/create|control/install )
        sipb-xen-remote-create "$SERVICE" "$MACHINE" "$@" ;;

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

        sipb-xen-remote-listhost "$MACHINE" "$@" ;;
     control/* )
        # Everything but create must go where the VM is already running.
        sipb-xen-remote-listhost "$MACHINE" "$@" ;;
     control/* )
        # Everything but create must go where the VM is already running.