diff --git a/defaults.inc b/defaults.inc index be7cf352..65995f40 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.131-01112024' +VERS='2.5.132-01112024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 35086c49..cfd384d8 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -444,7 +444,8 @@ BATT VOLTAGE: ${BATTVOLT}'volts" 1 if [ ! -f ${PW_TMPFOLDER}/power.ac.conserve ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.ac.low)) -ge $(echo "scale=0; ${PW_CONSERVE_AFTER}*60/1" | bc) ]; then echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Shutting down iSCSI VM's and Host to conserve power" >> ${PW_LOGPOWER} SENDNOTICE "POWER ALERT - Conserving Power" "Shutting down iSCSI VM's and Host to conserve power" 1 - SHUTDOWN_SERVER ${PW_MAIN_ISCSI} -esxi off & + # SHUTDOWN_SERVER ${PW_MAIN_ISCSI} -esxi off & + CONSERVE_POWER & touch ${PW_TMPFOLDER}/power.ac.conserve fi fi diff --git a/powerwall.sh b/powerwall.sh index fd08e424..e8f48fdc 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -155,6 +155,11 @@ SHUTDOWN_OFFSITE(){ fi } +CONSERVE_POWER(){ + SHUTDOWN_SERVER ${PW_MAIN_ISCSI} -esxi off + SHUTDOWN_SERVER 10.10.2.16 -esxi off +} + MAINT_MODE_VERIFY_SHUTDOWN(){ ESXIHOST=${1} MaintMode=""