Merge remote-tracking branch 'upstream/master' into FTY as of 20260116 #3267
+3,337
−896
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 <jimklimov+nut@gmail.com>
…: rename nut-udev-settle.service into a .in template, handle ExecCondition here too [networkupstools#3233] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… 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 <jimklimov+nut@gmail.com>
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 <jimklimov+nut@gmail.com>
…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 <jimklimov+nut@gmail.com>
…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 <jimklimov+nut@gmail.com>
…OBS logo [networkupstools#1209] Fetched from https://upload.wikimedia.org/wikipedia/commons/3/35/Obs-logo.png Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…stools#1209] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…upstools#2829] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
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 <tomli@tomli.me>
…: fix "nobattery" alarm on OpenUPS devices [networkupstools#3246] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…-port-fix drivers/huawei-ups2000.c: call ser_close() before modbus_connect(), fix networkupstools#3244.
…3207] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…of Microsoft IIS to host the NUT CGI programs [networkupstools#3207] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…upstools#3207] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…lly [networkupstools#3207] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…-in CONFPATH [networkupstools#3207] Already done for other files, only hosts.conf was seeked wrongly. Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ath() rather than built-in CONFPATH, and document the (incomplete) *mib.conf support Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…mic confpath() rather than built-in CONFPATH Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
networkupstools#3207] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… clients [networkupstools#3207] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…an/upsset.conf.txt, NEWS.adoc, docs/nut.dict: introduce --with-cgi-uri [networkupstools#3207] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…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 <jimklimov+nut@gmail.com>
…ARED_PRIVATE_LIBS [networkupstools#2800] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ARED_PRIVATE_LIBS more conservatively [networkupstools#2800] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…n we configure --without-serial Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ot currently mean disabling modbus drivers nor libnutscan ability to talk serial Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…mmy_usb.la [networkupstools#2800] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…mmy_usb.la [networkupstools#2800] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…g of suggest_NDE_conflict() when we ENABLE_SHARED_PRIVATE_LIBS [networkupstools#2800] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Experiment building NUT with shared private libraries
…ex for libnutscan [networkupstools#2800] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
|
❌ Build nut 2.8.4.4061-FTY failed (commit b47b19a88d by @jimklimov) |
…ARED_PRIVATE_LIBS [networkupstools#2800] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
|
✅ Build nut 2.8.4.4065-FTY completed (commit 01652a0cb8 by @jimklimov) |
… group the variables we apply as one bunch, not as several separate hits
…be consistent, take two Signed-off-by: Jim Klimov <jimklimov@gmail.com>
…ds" from master to DMF branch For some reason, these lines to allow faults/avoid tests on some system combos were absent in DMF branch, and it still works. Was it known covered in other scenarios on master? Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…be consistent, take two Signed-off-by: Jim Klimov <jimklimov@gmail.com>
… default (DMF branch) Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…nches Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ort-symbols-regex for DMF/legacy builds with minimal difference Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… base, so master-branch text lines match exactly Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…as build-dependent behavior Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
…ter-branch text lines match exactly Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
… master-branch text lines match exactly Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
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.