From: Sander Eikelenboom <linux@eikelenboom.it>
Date: Thu, 11 Oct 2012 09:21:16 +0000 (+0100)
Subject: init scripts: xendomains correct order of options for shutdown command
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7760
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=29be730ec77c6ed3ef964131cce72db632b29d1f;p=xen.git

init scripts: xendomains correct order of options for shutdown command

Options for the shutdown command that are supplied behind the domain id are
ignored. In case of the default xendomains init script this means that it will
not wait for the domains to be actually shutdown.

Signed-off-by: Sander Eikelenboom <linux@eikelenboom.it>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains
index c033581253..90949ed43e 100644
--- a/tools/hotplug/Linux/init.d/xendomains
+++ b/tools/hotplug/Linux/init.d/xendomains
@@ -438,7 +438,7 @@ stop()
 	    echo -n "(shut)"
 	    watchdog_xencmd shutdown &
 	    WDOG_PID=$!
-	    XMR=`$CMD shutdown $id $XENDOMAINS_SHUTDOWN 2>&1 1>/dev/null`
+	    XMR=`$CMD shutdown $XENDOMAINS_SHUTDOWN $id 2>&1 1>/dev/null`
 	    if test $? -ne 0; then
 		echo -e "\nAn error occurred while shutting down domain:\n$XMR\n"
 		rc_failed $?