[Xen-changelog] [xen-4.2-testing] init scripts: xendomains correct order of options for shutdown command

[Xen patchbot-4.2-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Sander Eikelenboom <linux@xxxxxxxxxxxxxx>
# Date 1351266477 -3600
# Node ID fcd73195cf24175738135c144defcdb01fe74f37
# Parent  1787c24c9808c8491cb0d5365a3b347f326952c2
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@xxxxxxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

xen-unstable changeset: 26044:4845b5ce90e8
Backport-requested-by: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 1787c24c9808 -r fcd73195cf24 tools/hotplug/Linux/init.d/xendomains
--- a/tools/hotplug/Linux/init.d/xendomains     Fri Oct 26 16:47:33 2012 +0100
+++ b/tools/hotplug/Linux/init.d/xendomains     Fri Oct 26 16:47:57 2012 +0100
@@ -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 $?

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog