aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSander Eikelenboom <linux@eikelenboom.it>2012-10-26 16:47:57 +0100
committerSander Eikelenboom <linux@eikelenboom.it>2012-10-26 16:47:57 +0100
commit14c081c8b94a8e4b1878c7a80fabe7a61c239d3b (patch)
tree561eeec4bf03b88659c5b175c01293ede9b2bae6
parent3f3e58b40c86bdaf3dd1f94baf0b41839939522b (diff)
downloadxen-14c081c8b94a8e4b1878c7a80fabe7a61c239d3b.tar.gz
xen-14c081c8b94a8e4b1878c7a80fabe7a61c239d3b.tar.bz2
xen-14c081c8b94a8e4b1878c7a80fabe7a61c239d3b.zip
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> xen-unstable changeset: 26044:4845b5ce90e8 Backport-requested-by: Ian Campbell <Ian.Campbell@citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r--tools/hotplug/Linux/init.d/xendomains2
1 files changed, 1 insertions, 1 deletions
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 $?