From ce73823285211256a03a64df0205212a0614b076 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 2 Nov 2023 15:19:18 -0500
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index e6587664..c5990180 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1007,7 +1007,7 @@ SHUTDOWN_SERVERS(){
 			echo "Done"
 		
 			for ESXIHOST in "${PW_MAINSITE_HOSTS[@]}"; do
-				echo -en "Stopping iSCSI VM's on: ${ESXIHOST} ... "
+				echo -en "Stopping iSCSI-PRI VM's on: ${ESXIHOST} ... "
 				[ "${TEST}" != "true" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1)
 				echo "Done"
 			done
@@ -1016,13 +1016,13 @@ SHUTDOWN_SERVERS(){
 				[ "${TEST}" != "true" ] && run=$(${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${ESXIHOST} & >/dev/null 2>&1)
 				echo "Done"
 			done
-			sleep 1m
+			# sleep 1m
 			for ESXIHOST in "${PW_MAINSITE_HOSTS[@]}"; do
-				echo -en "Verifying iSCSI VM's stopped on: ${ESXIHOST} ... "
+				echo -en "Verifying iSCSI-PRI VM's stopped on: ${ESXIHOST} ... "
 				[ "${TEST}" != "true" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1)
 				echo "Done"
 			done
-			for ESXIHOST in "${PW_MAINHOSTS[@]}"; do
+			for ESXIHOST in "${PW_MAINSITE_HOSTS[@]}"; do
 				echo -en "Stopping Remaining VM's on: ${ESXIHOST} ... "
 				if [ "${TEST}" != "true" ]; then
 					run=$(${PW_FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1)
@@ -1030,7 +1030,7 @@ SHUTDOWN_SERVERS(){
 				fi
 				echo "Done"
 			done
-			for ESXIHOST in "${PW_MAINHOSTS[@]}"; do
+			for ESXIHOST in "${PW_MAINSITE_HOSTS[@]}"; do
 				echo -en "Shutting down host & disabling Maintenance Mode: ${ESXIHOST} ..."
 				if [ "${TEST}" != "true" ]; then
 					run=$(ssh root@${ESXIHOST} 'esxcli system shutdown poweroff -d 10 -r "Automated ESXi host shutdown"')
@@ -1066,7 +1066,7 @@ SHUTDOWN_SERVERS(){
 			fi
 						
 			for ESXIHOST in "${PW_SYSHOSTS[@]}"; do
-				echo -en "Stopping iSCSI VM's on: ${ESXIHOST} ... "
+				echo -en "Stopping iSCSI-SYS VM's on: ${ESXIHOST} ... "
 				[ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1
 				echo "Done"
 			done
@@ -1076,6 +1076,11 @@ SHUTDOWN_SERVERS(){
 				echo "Done"
 			done
 			# sleep 1m
+			for ESXIHOST in "${PW_MAINSITE_HOSTS[@]}"; do
+				echo -en "Verifying iSCSI-SYS VM's stopped on: ${ESXIHOST} ... "
+				[ "${TEST}" != "true" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1)
+				echo "Done"
+			done
 			# for ESXIHOST in "${PW_SYSHOSTS[@]}"; do
 			# 	echo -en "Suspending MySQL & LAN-DNS VM's on: ${ESXIHOST} ... "
 			# 	[ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/sys-suspend.ps1 ${ESXIHOST} >/dev/null 2>&1