Respond to remctl install requests by passing the options onto Xen

svn path=/trunk/packages/sipb-xen-remctl-auto/; revision=1089

diff --git a/debian/changelog b/debian/changelog
index 32929f3..a2c20bf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-remctl-auto (1.3) unstable; urgency=low
+
+  * Respond to remctl install requests by passing the options onto Xen
+
+ -- Evan Broder <broder@mit.edu>  Thu, 09 Oct 2008 01:57:30 -0400
+

 sipb-xen-remctl-auto (1.2) unstable; urgency=low
 
   * Exit successfully if inetd is already running; package fails to
 sipb-xen-remctl-auto (1.2) unstable; urgency=low
 
   * Exit successfully if inetd is already running; package fails to

diff --git a/files/usr/sbin/sipb-xen-remote b/files/usr/sbin/sipb-xen-remote
index 434009c..3ec0c95 100755 (executable)
--- a/files/usr/sbin/sipb-xen-remote
+++ b/files/usr/sbin/sipb-xen-remote
@@ -17,18 +17,9 @@ case "$TYPE" in
             lvcreate|lvremove|lvrename|lvresize)
                 COMMAND=/usr/sbin/sipb-xen-lvm
                ;;
             lvcreate|lvremove|lvrename|lvresize)
                 COMMAND=/usr/sbin/sipb-xen-lvm
                ;;

-            lvcopy)
-                COMMAND=/usr/sbin/sipb-xen-lvcopy
-               ;;

             vmboot)
                 COMMAND=/usr/sbin/sipb-xen-vmcontrol
                ;;
             vmboot)
                 COMMAND=/usr/sbin/sipb-xen-vmcontrol
                ;;

-            install)
-                COMMAND=/usr/sbin/sipb-xen-install
-               ;;
-            register|moveregister|unregister|remctl-moira-update)
-                COMMAND=/usr/sbin/sipb-xen-remctl-update
-               ;;

             listvms)
                 COMMAND=/usr/sbin/sipb-xen-listvms
                ;;
             listvms)
                 COMMAND=/usr/sbin/sipb-xen-listvms
                ;;

diff --git a/files/usr/sbin/sipb-xen-vmcontrol b/files/usr/sbin/sipb-xen-vmcontrol
index 3bbf63e..d671033 100755 (executable)
--- a/files/usr/sbin/sipb-xen-vmcontrol
+++ b/files/usr/sbin/sipb-xen-vmcontrol
@@ -22,15 +22,14 @@ case "$ACTION" in
        /usr/sbin/sipb-xen-update-conserver </dev/null >/dev/null 2>&1 &
        ;;
     install|create|reboot)
        /usr/sbin/sipb-xen-update-conserver </dev/null >/dev/null 2>&1 &
        ;;
     install|create|reboot)

-       ARG="$3"
-       shift; shift; shift; MOREARGS="$*"
+       shift; shift;

        if [ "$ACTION" = "reboot" ]; then
            xm destroy "$MACHINE" 2>/dev/null
        else
            xm list "$MACHINE" >/dev/null 2>/dev/null && echo "$MACHINE already exists" && exit 1
        fi
        if [ "$ACTION" = "install" ]; then
        if [ "$ACTION" = "reboot" ]; then
            xm destroy "$MACHINE" 2>/dev/null
        else
            xm list "$MACHINE" >/dev/null 2>/dev/null && echo "$MACHINE already exists" && exit 1
        fi
        if [ "$ACTION" = "install" ]; then

-           xm create sipb-database machine_name="$ORIGMACHINE" installer="$ARG" installer_options="$MOREARGS"
+           xm create sipb-database machine_name="$ORIGMACHINE" installer_options=\""$*"\"

 #      elif [ "$ACTION" = "copy" ]; then
 #           sipb-xen-duplicate ...etc...
        elif [ -n "$ARG" ]; then
 #      elif [ "$ACTION" = "copy" ]; then
 #           sipb-xen-duplicate ...etc...
        elif [ -n "$ARG" ]; then