From 7a5f7f2d9111727eab19c884550f9ee90d84fa6b Mon Sep 17 00:00:00 2001 From: Armando Migliaccio Date: Fri, 20 Apr 2012 22:58:00 +0100 Subject: [PATCH] bug 986401: xe vm-shutdown expects running instances in os_install_domU.sh do not fail if the instance is already halted. Change-Id: Id080535c1eb008c9fc7335c9004318bbfb41e1f7 --- tools/xen/install_os_domU.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh index 54c93c7131..3c25d4a501 100755 --- a/tools/xen/install_os_domU.sh +++ b/tools/xen/install_os_domU.sh @@ -150,7 +150,7 @@ if [ "$DO_SHUTDOWN" = "1" ]; then for uuid in `xe vm-list | grep -1 instance | grep uuid | sed "s/.*\: //g"`; do echo "Shutting down nova instance $uuid" xe vm-unpause uuid=$uuid || true - xe vm-shutdown uuid=$uuid + xe vm-shutdown uuid=$uuid || true xe vm-destroy uuid=$uuid done