Merge remote-tracking branch 'upstream/master' into FTY as of 20260116 #3267
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Tested with ExecCondition=/bin/sh -c '[ "$MODE" != "netclient" ]' an
Not sure if there is a better way to call `sh` without assuming a static dir. Something like `command -v sh`
…BLE_EXEC_CONDITION@ and put ExecCondition for MODE values into more units; depend from NDE path units also on nut.conf changes; bump systemd integration copyrights [networkupstools#3233] Signed-off-by: Jim Klimov <[email protected]>
…: rename nut-udev-settle.service into a .in template, handle ExecCondition here too [networkupstools#3233] Signed-off-by: Jim Klimov <[email protected]>
… also consider "none" [networkupstools#3233] Also fix nut-monitor.service (upsmon) to still start for a "netserver": it is a full setup like "standalone", just with not only `localhost` clients expected. Signed-off-by: Jim Klimov <[email protected]>
Just launch nut-server systemd service if we are not on netclient mode
…inently the NUT CI farm hosting provider (and Fosshost, like Travis CI, is history) [networkupstools#2192] Signed-off-by: Jim Klimov <[email protected]>
…reference openSUSE Build Service as a part of NUT CI farm [networkupstools#1209] Use logo copied from https://build.opensuse.org/rails/active_storage/blobs/redirect/eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBCZz09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--043a458c5587aea3e3a61e9727a75569eab11948/openSUSEBuildService.png Signed-off-by: Jim Klimov <[email protected]>
…go [networkupstools#1209] Copied from https://github.com/openSUSE/open-build-service/blob/master/docs/obs-logo.svg as of their commit 43c17f6 Signed-off-by: Jim Klimov <[email protected]>
…OBS logo [networkupstools#1209] Fetched from https://upload.wikimedia.org/wikipedia/commons/3/35/Obs-logo.png Signed-off-by: Jim Klimov <[email protected]>
] Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
…stools#1209] Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
…upstools#2829] Signed-off-by: Jim Klimov <[email protected]>
networkupstools#3244. In drivers/huawei-ups2000.c, the serial port is opened twice. Once by ser_open() to manually perform device identification, once by modbus_connect() for communicating with the UPS after identification succeeds. However, holding two file descriptors of the same serial port is problematic on Windows, even if they're not actually used at the same time. A serial port is usually opened on Windows via CreateFileA() with dwShareMode = 0, which is done by libmodbus. According to the Win32 API documentation: > If this parameter is zero and CreateFile succeeds, the file or device > cannot be shared and cannot be opened again until the handle to the > file or device is closed. This is responsible for the following error on Windows: modbus_connect: unable to connect: No error Driver failed to start (exit status=1) This commit leaves only the raw ser_open() call in upsdrv_initups(), the modbus_connect() call is deleted to avoid opening the same serial port again. After device identification succeeds later in ups2000_device_identification() - called by upsdrv_initinfo(), the raw serial port is closed. Once at this point, modbus_connect() is called, just before upsdrv_initinfo() returns. Signed-off-by: Yifeng Li <[email protected]>
…: fix "nobattery" alarm on OpenUPS devices [networkupstools#3246] Signed-off-by: Jim Klimov <[email protected]>
…-port-fix drivers/huawei-ups2000.c: call ser_close() before modbus_connect(), fix networkupstools#3244.
…3207] Signed-off-by: Jim Klimov <[email protected]>
…of Microsoft IIS to host the NUT CGI programs [networkupstools#3207] Signed-off-by: Jim Klimov <[email protected]>
…upstools#3207] Signed-off-by: Jim Klimov <[email protected]>
…lly [networkupstools#3207] Signed-off-by: Jim Klimov <[email protected]>
…-in CONFPATH [networkupstools#3207] Already done for other files, only hosts.conf was seeked wrongly. Signed-off-by: Jim Klimov <[email protected]>
…ath() rather than built-in CONFPATH, and document the (incomplete) *mib.conf support Signed-off-by: Jim Klimov <[email protected]>
…mic confpath() rather than built-in CONFPATH Signed-off-by: Jim Klimov <[email protected]>
networkupstools#3207] Signed-off-by: Jim Klimov <[email protected]>
… clients [networkupstools#3207] Signed-off-by: Jim Klimov <[email protected]>
…an/upsset.conf.txt, NEWS.adoc, docs/nut.dict: introduce --with-cgi-uri [networkupstools#3207] Signed-off-by: Jim Klimov <[email protected]>
…rt on WIN32 builds [networkupstools#3207] Let CGI work under IIS with `\\?\c:\...` paths to config files. TOTHINK: Maybe move this closer to GetModuleName() calls? Signed-off-by: Jim Klimov <[email protected]>
…etworkupstools#3253] Signed-off-by: Jim Klimov <[email protected]>
…sprintf=>snprintf in DMF code base [networkupstools#3255] Signed-off-by: Jim Klimov <[email protected]>
jimklimov
force-pushed
the
FTY-remerge-20260116
branch
from
6f3cf7e to
9b1d124
Compare
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
…-sysusers.conf [networkupstools#3262] Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
… built one Signed-off-by: Jim Klimov <[email protected]>
Fix OBS recipes Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
|
✅ Build nut 2.8.4.4014-FTY completed (commit fbc45109e3 by @jimklimov) |
Add missing data points for Goldenmate to iDowell subdriver
Helptext align
Signed-off-by: Jim Klimov <[email protected]>
…wly Goldenmate) devices on USB ID v075Dp0300 [networkupstools#3265] Signed-off-by: Jim Klimov <[email protected]>
…orkupstools#3268] Contributed via mailing list at https://alioth-lists.debian.net/pipermail/nut-upsdev/2026-January/008184.html Authored-by: John.Chang <[email protected]> Signed-off-by: Jim Klimov <[email protected]>
…p to report battery.voltage [networkupstools#2766] Authored-By: Vladyslav Andreichykov <[email protected]> Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Simone <[email protected]>
Signed-off-by: Simone <[email protected]>
…S-ERA-PLUS-2000 Add UPS model 'UPS ERA PLUS 2000' to driver list
Several small fixes contributed out of PR stream
Signed-off-by: Jim Klimov <[email protected]>
|
✅ Build nut 2.8.4.4056-FTY completed (commit 3569440a86 by @jimklimov) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bring updates from master, and apply similar code quality changes to DMF added code.