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

[Bastian Blank]

Author: waldi
Date: Tue Sep 18 11:15:45 2012
New Revision: 1110

Log:
* debian/changelog: Update.
* debian/xen-utils-common.xendomains.init
  - Ask all domains to shut down.
  - Check every one if it is already dead.

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 10:58:54 2012	(r1109)
+++ branches/wheezy/xen/debian/changelog	Tue Sep 18 11:15:45 2012	(r1110)
@@ -3,6 +3,7 @@
   * Xen domain init script:
     - Make sure Open vSwitch is started before any domain.
     - Properly handle and show output of failed migrate and save.
+    - Ask all domains to shut down befbefore checking them.
 
  -- 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 10:58:54 2012	(r1109)
+++ branches/wheezy/xen/debian/xen-utils-common.xendomains.init	Tue Sep 18 11:15:45 2012	(r1110)
@@ -184,9 +184,15 @@
   while read id name rest; do
     log_action_begin_msg "Shutting down Xen domain $name ($id)"
     xen shutdown $id 2>&1 1>/dev/null
-    timeout_domain "$name" "$XENDOMAINS_STOP_MAXWAIT"
     log_action_end_msg $?
   done < <(/usr/lib/xen-common/bin/xen-init-list)
+  while read id name rest; do
+    if check_running "$name"; then
+      log_action_begin_msg "Waiting for Xen domain $name ($id) to shut down"
+      timeout_domain "$name" "$XENDOMAINS_STOP_MAXWAIT"
+      log_action_end_msg $?
+    fi
+  done < <(/usr/lib/xen-common/bin/xen-init-list)
 }
 
 do_stop()