packages/net/nut/files, branch master

nut: use common log functions instead of direct logger calls

2026-07-19T09:23:51Z

Where possible prefer the log wrappers to direct logger calls. Signed-off-by: Daniel F. Dickinson

nut: add process id to log messages

2026-07-19T09:23:51Z

Show the PID beside the syslog_id to aid debugging. Signed-off-by: Daniel F. Dickinson

nut: manage logging

2026-07-19T09:23:51Z

NUT (upstream) logging has changed. With the introduction of NUT_DEBUG_SYSLOG we can set it to "stderr" and have NUT's messages go to stderr only. This avoid most duplicate messages when procd sends stderr to syslog. The reverse (syslog only from NUT) is not a current configuration option. See the section for NUT_DEBUG_SYSLOG at https://networkupstools.org/docs/man/nut.conf.html#_directives This is needed because we use '-FF' so that the daemons remain in the foreground, which is required for procd to manage them. When using '-FF' logging behaves differently in NUT than when backgrounded. Unfortunately, there is still some work to be done upstream to completely eliminate duplicate messages, so some message continue to appear twice, though not neccessarily with the same facility.priority. See also https://github.com/jimklimov/nut/blob/0c3eed09b89cce1e5c0c65ca03d05b4612371cb8/UPGRADING.adoc#changes-from-282-to-283 and https://github.com/openwrt/packages/pull/29896#issuecomment-5012737643 Conversely, the log messages the initscripts emit are now configured to emit only to syslog and not to stderr. This avoids duplicates messages caused by procd's automatic (not configurable) behaviour of sending the initscript's stderr to syslog, while preserving the syslogid, facility and priority we want. Signed-off-by: Daniel F. Dickinson

nut: split interface_triggers function

2026-07-15T07:34:39Z

Using add_interface_triggers and check_interface_up is a better separation of concerns and the code has little in common (no duplication of code concerns). While we are at it make both nut-monitor and nut-server failure of add_interface_triggers non-fatal with a logged error message. Signed-off-by: Daniel F. Dickinson

nut: add more common validators and add more validation

2026-07-15T07:34:39Z

Factor out some common validation code into some validator functions, and add more UCI config validation. Signed-off-by: Daniel F. Dickinson

nut: simplify/improve consistency for RUNAS and STATEPATH

2026-07-15T07:34:39Z

We claimed we only supported a single upsd section named 'upsd' and a single uspmon section named 'upsmon', but when determining RUNAS and STATEPATH we were using overly-complex functions as we were attempting to support multiple upsd and upsmon sections. Simplify the logic by adhering to our stated support. While were are at it we make RUNAS handling more consistent between nut-server (upsd) and nut-monitor (upsmon). We no longer try to limp along if RUNAS is not set by find_runas; to do this properly would require over-complicated logic when setting file and directory permissions and ownership. Signed-off-by: Daniel F. Dickinson

nut: minor fixes found via automated code review

2026-07-15T07:34:39Z

* Fixes a missing word in a comment * Fixes inconsistent indentation in sample configurations * Drops redundant default assignment in find_statepath() Signed-off-by: Daniel F. Dickinson

nut: do not trigger on interface activity by default

2026-07-15T07:34:39Z

The defaults were triggiering on any activity on the network, which caused excessive restarts. So default to no interface trigger, with 'all' (or specific interfaces) as an option. See https://github.com/openwrt/packages/pull/29607#discussion_r3463553192 Signed-off-by: Daniel F. Dickinson

nut: fix hard-coded trigger scripts for interface triggers

2026-07-15T07:34:39Z

The trigger script and instance to reload should depend on which initscript is calling interface_triggers. It wasn't, so we fix that. See https://github.com/openwrt/packages/pull/29607#discussion_r3463544231 Signed-off-by: Daniel F. Dickinson

nut: remove driverpath configuration

2026-07-15T07:34:39Z

While driverpath is could in theory be configurable, this was not implemented in the OpenWrt NUT package, and there is not need for it. Therefore remove the sample configuration for it, and setting that configuration in the upsd.conf file. See https://github.com/openwrt/packages/pull/29607#discussion_r3463526037 Signed-off-by: Daniel F. Dickinson