diff --git a/defaults.inc b/defaults.inc index b35e912c..94b4ce3d 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.16-12132023' +VERS='2.5.17-12132023' noheader=' update service dailytemp confsync ' HC_CW=60 diff --git a/esxi-scripts/iscsi-all-shutdown-verify.ps1 b/esxi-scripts/iscsi-all-shutdown-verify.ps1 index 3b62ba43..0043530a 100755 --- a/esxi-scripts/iscsi-all-shutdown-verify.ps1 +++ b/esxi-scripts/iscsi-all-shutdown-verify.ps1 @@ -9,7 +9,6 @@ $VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-*'} | Get-VM Foreach ($VM in $VMLIST) { while((Get-VM $VM).PowerState -ne 'PoweredOff') { - write-host waiting Start-Sleep -Seconds 1 } } diff --git a/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 b/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 index 8a8b5daa..aba18b0b 100755 --- a/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 +++ b/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 @@ -9,7 +9,6 @@ $VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-SYS*'} | Get-VM Foreach ($VM in $VMLIST) { while((Get-VM $VM).PowerState -ne 'PoweredOff') { - write-host waiting Start-Sleep -Seconds 1 } } diff --git a/esxi-scripts/iscsi-vm-shutdown-verify.ps1 b/esxi-scripts/iscsi-vm-shutdown-verify.ps1 index f6b8d431..c85ce734 100755 --- a/esxi-scripts/iscsi-vm-shutdown-verify.ps1 +++ b/esxi-scripts/iscsi-vm-shutdown-verify.ps1 @@ -9,7 +9,6 @@ $VMLIST = Get-Datastore | Where {$_.Name -like '*iSCSI-PRI*'} | Get-VM Foreach ($VM in $VMLIST) { while((Get-VM $VM).PowerState -ne 'PoweredOff') { - write-host waiting Start-Sleep -Seconds 1 } } diff --git a/esxi-scripts/vm-shutdown-verify.ps1 b/esxi-scripts/vm-shutdown-verify.ps1 index 22845618..ede4064f 100755 --- a/esxi-scripts/vm-shutdown-verify.ps1 +++ b/esxi-scripts/vm-shutdown-verify.ps1 @@ -9,7 +9,6 @@ $VMLIST = Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -notlike '*CLS Foreach ($VM in $VMLIST) { while((Get-VM $VM).PowerState -ne 'PoweredOff') { - write-host waiting Start-Sleep -Seconds 1 } } diff --git a/powerwall.sh b/powerwall.sh index a33cdb49..2945437a 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -1777,8 +1777,8 @@ MAINT_MODE_VERIFY_SHUTDOWN(){ sleep 3s MaintMode=$(ssh root@${ESXIHOST} 'esxcli system maintenanceMode get') done - ssh root@${ESXIHOST} 'esxcli system shutdown poweroff -d 10 -r "Power-Monitor script initiated system shutdown"' - ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e false -t 0' + # ssh root@${ESXIHOST} 'esxcli system shutdown poweroff -d 10 -r "Power-Monitor script initiated system shutdown"' + # ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e false -t 0' # if [ "${ESXIHOST}" == "10.10.2.10" ]; then # while ping -qw 10 -c3 "${ESXIHOST}">/dev/null 2>&1; do sleep 1; done