Bug fix - fixes #80

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

diff --git a/debian/changelog b/debian/changelog
index 1394f74..ee504f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sipb-xen-remctl-auto (1.0.10) unstable; urgency=low
+
+  * Delay running sipb-xen-update-conserver
+
+ -- Evan Broder <broder@mit.edu>  Mon, 21 Apr 2008 20:26:28 -0400
+

 sipb-xen-remctl-auto (1.0.9) unstable; urgency=low
 
   * Change the way that conserver is updated
 sipb-xen-remctl-auto (1.0.9) unstable; urgency=low
 
   * Change the way that conserver is updated

diff --git a/files/usr/sbin/sipb-xen-vmcontrol b/files/usr/sbin/sipb-xen-vmcontrol
index 1183134..1e60b76 100755 (executable)
--- a/files/usr/sbin/sipb-xen-vmcontrol
+++ b/files/usr/sbin/sipb-xen-vmcontrol
@@ -19,7 +19,7 @@ case "$ACTION" in
        ;;
     destroy|shutdown)
        xm "$ACTION" "$MACHINE"
        ;;
     destroy|shutdown)
        xm "$ACTION" "$MACHINE"

-       /usr/sbin/sipb-xen-update-conserver
+       /usr/sbin/sipb-xen-update-conserver &

        ;;
     install|create|reboot)
        ARG="$3"
        ;;
     install|create|reboot)
        ARG="$3"

@@ -38,7 +38,7 @@ case "$ACTION" in
        else
            xm create sipb-database machine_name="$ORIGMACHINE"
        fi
        else
            xm create sipb-database machine_name="$ORIGMACHINE"
        fi

-       /usr/sbin/sipb-xen-update-conserver
+       (sleep 4; /usr/sbin/sipb-xen-update-conserver) </dev/null >/dev/null 2>&1 &

        ;;
     list-long)
        xm list --long "$MACHINE"
        ;;
     list-long)
        xm list --long "$MACHINE"