Add support for POWEROFF_WAIT parameter #384
Conversation
| @SBINDIR@/upsmon -K >/dev/null 2>&1 && @SBINDIR@/upsdrvctl shutdown | ||
|
|
||
| if @SBINDIR@/upsmon -K >/dev/null 2>&1; then | ||
| wait_delay=`/bin/sed -ne 's#^ *POWEROFF_WAIT= *\(.*\)$#\1#p' /etc/nut/nut.conf` |
There was a problem hiding this comment.
As an .in template this should not refer to specific pathnames (etc => @sysconfdir@)...
And I'm not fully sure about /bin/sed ;)
There was a problem hiding this comment.
Also, perhaps sed should look for numbers spelled like \([0-9][0-9]*\)[^0-9]*$ for those dummiest implementations?
|
|
||
| @SBINDIR@/upsdrvctl shutdown | ||
|
|
||
| if [ -n "$wait_delay" ] ; then |
There was a problem hiding this comment.
Should the check be for -n or for actually being a non-negative number?
There was a problem hiding this comment.
it's also possible to pass strings here, like "15m" so I don't think it's possible
There was a problem hiding this comment.
Oh, right. Well then, if "standard linux" sleep accepts whatever is coming, ok. If not, the sleep will be quite short ;)
|
|
||
| if [ -n "$wait_delay" ] ; then | ||
| sleep $wait_delay | ||
| /bin/systemctl reboot --force --force |
There was a problem hiding this comment.
For posterity (so someone does not remove a "duplicate" --force, a comment would be welcome.
| fi | ||
| fi | ||
|
|
||
| exit 0 |
There was a problem hiding this comment.
As an added bonus, this should solve that annoying message just before OS goes down along the lines that "systemd failed to stop nutshutdown service" on non-upsmon-master systems... LGTM just for that ;)
There was a problem hiding this comment.
Is there any reason /bin/systemctl reboot --force --force isn't being run when POWEROFF_WAIT is not set or am I misunderstanding something here?
There was a problem hiding this comment.
@peterhoeg upsdrvctl shutdown returns almost immediately, the UPS continues to give power for a few seconds after it receive the request to shutdown to let the machine shutdown cleanly.
bigon
force-pushed
the
bug-382
branch
2 times, most recently
from
ea61fd0
to
eb17566
Compare
Use "systemctl reboot --force --force" to reboot the machine has not been shutdown after the POWEROFF_WAIT delay. Closes: networkupstools#382
|
👍 |
|
Anyone else wanna chime in? @peterhoeg? |
|
I definitely would like to see this tested a bit more before it's merged :p |
| @SBINDIR@/upsmon -K >/dev/null 2>&1 && @SBINDIR@/upsdrvctl shutdown | ||
|
|
||
| if @SBINDIR@/upsmon -K >/dev/null 2>&1; then | ||
| wait_delay=`/bin/sed -ne 's#^ *POWEROFF_WAIT= *\(.*\)$#\1#p' @sysconfdir@/nut.conf` |
There was a problem hiding this comment.
nitpicking, but prefer @CONFPATH@ over @sysconfdir@, otherwise you can end up with something not fully expanded like "${prefix}/etc/nut.conf" when not specifying --sysconfdir and using default flags.
I'll do some more testing over the afternoon if possible... and I'll take care of this CONFPATH when merging too ;)
There was a problem hiding this comment.
Yes, those ${prefix} verbatims are evil and hard to avoid, struck a few more of those in the system/SMF instance wrapping PR ;)
Use "systemctl reboot --force --force" to reboot the machine has not
been shutdown after the POWEROFF_WAIT delay.
Closes: #382