diff --git a/defaults.inc b/defaults.inc index 80a3ccdb..5d6b6a49 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.3.16-10252023' +VERS='2.3.17-10252023' noheader=' update service dailytemp ' diff --git a/powerwall.sh b/powerwall.sh index ac6beb27..bb50e2d1 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -947,7 +947,7 @@ SHUTDOWN_SERVER(){ ISCSIVMSHUTDOWN(){ for ESXIHOST in "${PW_MAINSITE_HOSTS[@]}"; do - echo -en "${idsCL[LightCyan]}Shutting down any VM's on '${ESXIHOST}' that are running on an iSCSI drive ... " + echo -en "${idsCL[LightCyan]}Shutting down any VM's on '${ESXIHOST}' that are running on an iSCSI-PRI drive ... " ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 & echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" echo @@ -956,6 +956,17 @@ ISCSIVMSHUTDOWN(){ echo -e "${idsCL[LightCyan]}Please wait a few minutes while all iSCSI guests are shutdown ..." echo } +ISCSISYSVMSHUTDOWN(){ + for ESXIHOST in "${PW_MAINSITE_HOSTS[@]}"; do + echo -en "${idsCL[LightCyan]}Shutting down any VM's on '${ESXIHOST}' that are running on an iSCSI-SYS drive ... " + ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 & + echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" + echo + done + + echo -e "${idsCL[LightCyan]}Please wait a few minutes while all iSCSI guests are shutdown ..." + echo +} LOGROTATE(){ # STOPALL_SERVICES @@ -1060,8 +1071,9 @@ fi ;; checkpower) CHECKPOWER;; test) CHECKTEMP ${2} ${3};; - iscsi-vm-shutdown) ISCSIVMSHUTDOWN;; - + iscsi-vm-shutdown) + [ "${2^^}" == "SYS" ] && ISCSISYSVMSHUTDOWN || ISCSIVMSHUTDOWN + ;; shutdownhost) SHUTDOWN_SERVER ${2};; shutdown_servers) SHUTDOWN_SERVERS ${2};; @@ -1137,7 +1149,8 @@ fi echo -e " ${idsCL[Yellow]}checkpower ${idsCL[Default]}--> Check Power Readings" echo echo -e " ${idsCL[Yellow]}shutdownhost {host-ip} ${idsCL[Default]}--> Shutdown host server" - echo -e " ${idsCL[Yellow]}iscsi-vm-shutdown ${idsCL[Default]}--> Shutdown all VM's running on an iSCSI Datastore" + echo -e " ${idsCL[Yellow]}iscsi-vm-shutdown {type} ${idsCL[Default]}--> Shutdown all VM's running on an iSCSI-(PRI or SYS) Datastore" + echo -e " ${idsCL[LightYellow]} type = { main='iSCSI-PRI' / sys='iSCSI-SYS' }${idsCL[Default]} --> Defaults to main (iSCSI-PRI)" echo -e " ${idsCL[Yellow]}shutdown_servers {type} ${idsCL[Default]}--> Shutdown selection of servers" echo -e " ${idsCL[LightYellow]} type = { main / sys / all }" echo