[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


  • To: xen-changelog@xxxxxxxxxxxxxxxxxxx
  • From: Xen patchbot-unstable <patchbot@xxxxxxx>
  • Date: Thu, 11 Oct 2012 19:22:08 +0000
  • Delivery-date: Thu, 11 Oct 2012 19:22:17 +0000
  • List-id: "Change log for Mercurial \(receive only\)" <xen-changelog.lists.xen.org>

# HG changeset patch
# User Sander Eikelenboom <linux@xxxxxxxxxxxxxx>
# Date 1349947276 -3600
# Node ID 4845b5ce90e85b43701a45d0f43be9de3ca1237a
# Parent  d1c3b589af50cd3d2afb9c84d154f9a7659afb9c
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>
---


diff -r d1c3b589af50 -r 4845b5ce90e8 tools/hotplug/Linux/init.d/xendomains
--- a/tools/hotplug/Linux/init.d/xendomains     Thu Oct 11 10:21:15 2012 +0100
+++ b/tools/hotplug/Linux/init.d/xendomains     Thu Oct 11 10:21:16 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


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.