[Pkg-xen-changes] r1107 - branches/wheezy/xen/debian

[Bastian Blank]

Author: waldi
Date: Tue Sep 18 08:32:53 2012
New Revision: 1107

Log:
* debian/changelog: Update.
* debian/xen-utils-common.xendomains.init: Handle errors in coproc.

Modified:
   branches/wheezy/xen/debian/changelog
   branches/wheezy/xen/debian/xen-utils-common.xendomains.init

Modified: branches/wheezy/xen/debian/changelog
==============================================================================
--- branches/wheezy/xen/debian/changelog	Tue Sep 18 08:10:12 2012	(r1106)
+++ branches/wheezy/xen/debian/changelog	Tue Sep 18 08:32:53 2012	(r1107)
@@ -1,6 +1,7 @@
 xen (4.1.3-3) UNRELEASED; urgency=low
 
   * Make sure OpenVSwitch is started before any domains.
+  * Properly handle failed migrate and save in init script.
 
  -- Bastian Blank <waldi at debian.org>  Tue, 18 Sep 2012 10:08:54 +0200
 

Modified: branches/wheezy/xen/debian/xen-utils-common.xendomains.init
==============================================================================
--- branches/wheezy/xen/debian/xen-utils-common.xendomains.init	Tue Sep 18 08:10:12 2012	(r1106)
+++ branches/wheezy/xen/debian/xen-utils-common.xendomains.init	Tue Sep 18 08:32:53 2012	(r1107)
@@ -53,15 +53,15 @@
 
 timeout_coproc()
 {
-  TIMEOUT="$1"
+  local TIMEOUT="$1"
+  local PID="$COPROC_PID"
   for no in $(seq 0 $TIMEOUT); do
-    if [ -z "$COPROC_PID" ]; then return 0; fi
+    if [ -z "$COPROC_PID" ]; then break; fi
     sleep 1
     log_action_cont_msg
   done
   kill -INT "$COPROC_PID" >/dev/null 2>&1
-  wait $COPROC_PID
-  return 1
+  wait $PID
 }
 
 timeout_domain()