--- xendomains-init.orig	2006-08-31 10:35:49.000000000 +0200
+++ xendomains-init	2006-08-31 10:37:55.000000000 +0200
@@ -52,7 +52,22 @@
 		name=$(get_domname ${dom})
 		if is_running ${name} ; then
 			ebegin "  Stopping domain ${name}"
-				xm shutdown --wait ${name} >/dev/null
+				count=0
+				einfon "    Waiting for domain ${name} (${SHUTDOWN_TIMEOUT:=60} sec) "
+				xm shutdown ${name} >/dev/null
+				while is_running ${name}; do
+					count=$(expr ${count} + 1)
+					if [ $count -gt ${SHUTDOWN_TIMEOUT} ] ; then
+						echo ""
+						einfon "    Destroying domain ${name}"
+						xm destroy ${name} >/dev/null
+						sleep 2	 # let xen get some time to do it
+						break
+					fi
+					sleep 1
+					echo -n "."
+				done
+				echo ""
 			eend $?
 		else
 			einfo "  Not Stopping domain ${name} - not running"