Merge tag 'upstream/2.6.5' into debian

Upstream version 2.6.5
This commit is contained in:
Laurent Bigonville 2012-08-12 23:39:32 +02:00
commit 4c70406ad9
201 changed files with 7974 additions and 709 deletions

315
ChangeLog
View file

@ -1,3 +1,318 @@
2012-08-08 Arnaud Quette <arnaud.quette@free.fr>
* [r3712] NEWS, UPGRADING, configure.in, docs/website/news.txt:
Final update for 2.6.5 release
* [r3711] drivers: Subversion ignored files completion
Mark oldmge-shut binary as Subversion ignored (no functional
changes)
* [r3710] docs/configure.txt, m4/nut_check_libltdl.m4: Complete
libltdl configuration options
Add configure options to add specific cflags
(--with-libltdl-includes) and libs (--with-libltdl-libs) for
libltdl. This serves at least to point at non standard location,
as on FreeBSD (reported by David Durieux)
2012-08-06 Arnaud Quette <arnaud.quette@free.fr>
* [r3708] docs/documentation.txt: Add a Wikipedia reference on
Solar controller
* [r3707] docs/Makefile.am, docs/images/eaton-logo.png,
docs/images/hostedby.png, docs/website/Makefile.am,
docs/website/css/web-layout.css, docs/website/web-layout.conf:
Free NUT from Eaton website hosting
NUT is no more hosted by Eaton. Arnaud Quette (NUT project
leader) has taken over NUT hosting on his own, to give NUT back
some independance. This effort is also part of a logic to stop
crediting Eaton for contributions from others (especially Arnaud
Quette, as an individual). The new hosting service is located, as
for Arnaud's blog (http://arnaud.quette.fr) on Gandi servers,
using PaaS. This will allow more flexibility and automation of
the release process
2012-08-06 Charles Lepple <clepple+nut@gmail.com>
* [r3704] configure.in, docs/man/Makefile.am,
docs/man/macosx-ups.txt, drivers/Makefile.am,
drivers/macosx-ups.c: macosx-ups: new OS X Power Sources
meta-driver
Mac OS X provides UPS status information in a format similar to
what is shown for laptop batteries. This driver will convert that
information into a format compatible with NUT.
2012-08-05 Charles Lepple <clepple+nut@gmail.com>
* [r3703] drivers/skel.c: Update comments in skel.c
Fixed a typo, and added fatalx() as an alternative to
fatal_with_errno()
* [r3702] docs/man/skel.txt: Update skeleton driver man page.
2012-08-03 Charles Lepple <clepple+nut@gmail.com>
* [r3701] docs/man/nutscan.txt, docs/man/nutscan_scan_avahi.txt:
nutscan documentation: editing
2012-07-31 Arnaud Quette <arnaud.quette@free.fr>
* [r3699] docs/images/simple.png: Remove extraneous text
* [r3698] data/driver.list.in: Add support for UNITEK Alpha650ipF
and Alpha650ipE
Add UNITEK Alpha650ipF and Alpha650ipE (USB ID 0x0f03:0x0001) to
the list of blazer_usb supported models (reported by Pascal
MIRALLES)
* [r3697] docs/website/projects.txt: Reference Buffalo NAS in
Related projects
Add a reference in the Related projects, on Buffalo TerraStation
(Business-class) NAS range, which uses NUT for power protection
2012-07-30 Arnaud Quette <arnaud.quette@free.fr>
* [r3696] docs/download.txt, docs/website/news.txt: First NUT
virtualization package (VMware ESXI 5.0)
Add the reference to the first NUT virtualization package. This
one is currently an external effort to add VMware NUT client for
ESXI 5.0. But this support will be part of NUT in the long run
2012-07-24 Charles Lepple <clepple+nut@gmail.com>
* [r3692] data/driver.list.in, docs/man/powercom.txt,
drivers/powercom-hid.c: Synchronize Powercom USB documentation
and code comments.
Apparently, there are at least two different models with the USB
VID:PID of 0d9f:0004. This update is based on the following
report by Gordon Longland:
http://lists.alioth.debian.org/pipermail/nut-upsuser/2012-July/007748.html
2012-07-23 Charles Lepple <clepple+nut@gmail.com>
* [r3689] docs/man/powercom.txt: powercom: Mention this driver is
serial only
2012-07-20 Frederic Bohe <fbohe-guest@alioth.debian.org>
* [r3688] data/driver.list.in, drivers/Makefile.am: Switch mge-shut
to oldmge-shut and newmge-shut to mge-shut
* [r3687] docs/man/mge-shut.txt: Update mge-shut man page for
notification argument.
* [r3686] drivers/usbhid-ups.c: Add a "notification" parameter to
newmge-shut driver.
It is only here for compatibility with mge-shut driver. It is
ignored since we are always using SHUT_SYNC_OFF in libshut.c.
2012-07-19 Frederic Bohe <fbohe-guest@alioth.debian.org>
* [r3683] docs/man/mge-shut.txt: Add a note in man page about
ondelay parameter unit discrepency between newmge-shut and
mge-shut driver.
mge-shut use a ten seconds unit for ondelay whereas newmge-shut
uses seconds.
* [r3682] drivers/usbhid-ups.c, drivers/usbhid-ups.h: Add a lowbatt
setting to newmge-shut in order to mimic mge-shut setting
2012-07-19 Emilien Kia <emilienkia-guest@alioth.debian.org>
* [r3681] server/Makefile.am, server/conf.c, server/netcmds.h,
server/netssl.c, server/netssl.h, server/ssl.c, server/ssl.h,
server/upsd.c: Replace server/ssl.[h|c] by server/netssl.[h|c] in
order to prepare nss branch merging.
2012-07-17 Arnaud Quette <arnaud.quette@free.fr>
* [r3678] drivers/apc-mib.c: APC SNMP MIB update and completion
Add available high precision values, new variables
(input.transfer.reason, battery.current.total and ups.test.date),
and move ambient.{temperature,humidity}.{high,low} to
ambient.1.*, since they relate to alarm threshold of external
probe 1 (patch from Hong-Gunn Chew)
* [r3677] docs/nut-names.txt: Clarify the use of multiple ambient
sensors
Multiple sensors can be exposed using the indexed notation.
'ambient.*', without index or using '0', relates to the embedded
sensor. For example: 'ambient.temperature' represent the embedded
sensor temperature. Other sensors (external, communication card,
...) can use indexes from '1' to 'n'. For example:
'ambient.1.temperature' for the first external sensor
temperature.
* [r3676] docs/nut-names.txt: NUT namespace completion
Add two new variables 'ups.test.date' and
'battery.current.total'. Also add a note on the 'ambient'
collection for supporting multiple sensors
2012-07-16 Arnaud Quette <arnaud.quette@free.fr>
* [r3675] drivers/nut-ipmipsu.c, drivers/nut-libfreeipmi.c,
m4/nut_check_libfreeipmi.m4, tools/nut-scanner/nut-scanner.c,
tools/nut-scanner/scan_ipmi.c: Support for FreeIPMI 1.1.x and
1.2.x
Prepare for supporting API changes in FreeIPMI 1.1.x and 1.2.x.
This is mostly related to SDR API simplifications. A 2nd
iteration will probably address code redundancy, whenever
possible
2012-07-10 Arnaud Quette <arnaud.quette@free.fr>
* [r3674] data/driver.list.in, drivers/eaton-mib.c,
drivers/eaton-mib.h, drivers/snmp-ups.c, drivers/snmp-ups.h: Add
support for Eaton ePDU Switched (Pulizzi)
Implement support for older Eaton / Powerware ePDU Switched.
These were once sold as Pulizzi, and have now been replaced by
newer model (Eaton Marlin implementation and others)
2012-07-09 Emilien Kia <emilienkia-guest@alioth.debian.org>
* [r3672] configure.in: Fix CppUnit detection.
Fix inconsistent test for CppUnit install (using pkg-config) to
really enable unit tests.
2012-07-05 Arnaud Quette <arnaud.quette@free.fr>
* [r3671] docs/man/nut-ipmipsu.txt: Fix an error on possible power
supplies status
2012-07-04 Arnaud Quette <arnaud.quette@free.fr>
* [r3670] clients/upssched.c: Fix upssched regression
Coverity branch merge r3555 introduced a regression: any
upssched.conf command that takes a second argument resulted in a
defective frame sent to the parent process. Thus, the command was
not executed (patch from Oliver Schonefeld)
* [r3669] Makefile.am, configure.in, tests, tests/Makefile.am: Add
basic infrastructure for unit tests
Merge eki-unittests branch, with some adjustments, to add a basic
initial infrastructure for unit tests, using CppUnit (v1.9.6+)
(from Emilien Kia, from Eaton)
2012-07-03 Arnaud Quette <arnaud.quette@free.fr>
* [r3668] scripts/systemd/nut-driver.service.in,
scripts/systemd/nutshutdown.in: Fix upsdrvctl call path
upsdrvctl is located in @driverexecdir@, not @SBINDIR@ (reported
by Michal Hlavinka, from Redhat)
2012-06-15 Arnaud Quette <arnaud.quette@free.fr>
* [r3666] configure.in: Adapt systemd installation directory #2
Complete commit r3665, by also adapting paths for service files
2012-06-14 Arnaud Quette <arnaud.quette@free.fr>
* [r3665] configure.in: Adapt systemd installation directory
Adapt systemd installation directory for the shutdown script, so
that it does not try to install it in the actual system
directory, but to the pointed build directory, including a sub
directory prefix
* [r3664] docs/new-clients.txt: Fix broken link to upscli_*(3) HTML
manual pages
2012-06-12 Arnaud Quette <arnaud.quette@free.fr>
* [r3662] docs/new-drivers.txt: Forgotten mention
upsdrv_info_t->name is also published as "driver.name" variable
* [r3661] docs/man/belkinunv.txt, drivers/belkinunv.c,
drivers/main.c, drivers/masterguard.c, drivers/metasys.c,
drivers/mge-utalk.c, drivers/microdowell.c,
drivers/nut-ipmipsu.c, drivers/safenet.c, drivers/tripplitesu.c,
drivers/usbhid-ups.c: Remove redundant driver.version.internal
publication
* [r3660] configure.in, docs/configure.txt,
docs/man/nut-scanner.txt: Add missing references to libltdl for
nut-scanner
nut-scanner requires libltdl (Libtool dlopen abstraction) since
NUT 2.6.3. Documentations have been completed, and nut-scanner
build status is now exposed in the build configuration summary
* [r3659] drivers/snmp-ups.c: Fix publication of
driver.version.data
Publish the MIB name and version in driver.version.data, rather
than merged into driver.version.internal
* [r3658] drivers/netxml-ups.c: Fix publication of
driver.version.data
netxml-ups subdriver version is to be tracked in
driver.version.data, not in driver.version.internal
* [r3657] docs/nut-names.txt: Add missing variable
driver.version.data
Add variable driver.version.data, to track version of the
internal data mapping, for generic drivers (reported by Luiz
Angelo Daros de Luca)
* [r3656] docs/nut-names.txt: Fix comment for
driver.version.internal
Drivers internal version are always tracked separately, and
stored in driver.version.internal
2012-06-11 Michal Soltys <msoltyspl-guest@alioth.debian.org>
* [r3655] drivers/apcsmart.c: apcsmart: tcsetattr/tcgetattr
addendum
This small patch moves the comparison sequence into separate
function. No functional changes.
Also minor retab! run on defines.
2012-06-11 Arnaud Quette <arnaud.quette@free.fr>
* [r3654] data/driver.list.in: Add support for REDi Blazer
Add REDi Blazer 400VA / 600VA / 800VA to the list of blazer_ser
supported models (reported by Marius Gavrilescu)
* [r3653] docs/nut-names.txt: Fix a typo error on power.minimum
description
power.minimum is really the minimum seen apparent power in VA
(reported by Luiz Angelo Daros de Luca)
2012-06-07 Arnaud Quette <arnaud.quette@free.fr>
* [r3652] data/driver.list.in, drivers/blazer_usb.c: Add support
for Online Zinto A
Add Online Zinto A (USB ID 0x06da:0x0601) to the list of
blazer_usb supported models (reported by Carsten Burkhardt)
2012-06-07 Charles Lepple <clepple+nut@gmail.com>
* [r3651] drivers/oneac.h: Remove unused constants to fix LLVM
compilation error.
2012-06-05 Arnaud Quette <arnaud.quette@free.fr>
* [r3650] docs/website/news.txt, docs/website/projects.txt: WMNut
updates
Update WMNut release (0.64) and hosting URL
2012-06-04 Arnaud Quette <arnaud.quette@free.fr>
* [r3647] docs/download.txt, docs/website/news.txt: Update Windows
package publications for 2.6.4-1
2012-05-31 Arnaud Quette <arnaud.quette@free.fr>
* [r3643] NEWS, UPGRADING, configure.in, docs/website/news.txt:

View file

@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
# subdirectories to build and distribute. The order matters, as
# several subdirectories depend on stuff in "common" or tools being built first
SUBDIRS = include common clients conf data tools docs drivers \
lib scripts server
lib scripts server tests
# COPYING is included automatically.
EXTRA_DIST = LICENSE-GPL2 LICENSE-GPL3 MAINTAINERS UPGRADING

View file

@ -145,6 +145,12 @@ CFLAGS = @CFLAGS@
CONFPATH = @CONFPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBLATEX = @DBLATEX@
DEFS = @DEFS@
@ -248,6 +254,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
@ -312,7 +319,7 @@ ACLOCAL_AMFLAGS = -I m4
# subdirectories to build and distribute. The order matters, as
# several subdirectories depend on stuff in "common" or tools being built first
SUBDIRS = include common clients conf data tools docs drivers \
lib scripts server
lib scripts server tests
# COPYING is included automatically.

53
NEWS
View file

@ -2,6 +2,55 @@ If you're upgrading from an earlier version, see the UPGRADING file.
For a complete list of changes, please refer to the ChangeLog file.
---------------------------------------------------------------------------
Release notes for NUT 2.6.5 - what's new since 2.6.4:
- This release Fix an important regression in upssched:
any upssched.conf command that takes a second argument resulted in
a defective frame sent to the parent process. Thus, the command was
not executed (report and patch from Oliver Schonefeld)
- Website hosting: free NUT from Eaton website hosting
NUT website (http://www.networkupstools.org) is no more hosted by Eaton.
Arnaud Quette (NUT project leader) has taken over NUT hosting on his own,
to give NUT back some independance.
This effort is also part of a logic to stop crediting Eaton for
contributions from others (especially Arnaud Quette, as an individual).
The new hosting service is located, as for Arnaud's blog
(http://arnaud.quette.fr) on Gandi servers, using PaaS. This will allow
more flexibility and automation of the release process
- macosx-ups: new OS X Power Sources meta-driver
Mac OS X provides UPS status information in a format similar to
what is shown for laptop batteries. This driver will convert that
information into a format compatible with NUT (Charles Lepple).
- support for new devices:
Eaton ePDU Switched
Online Zinto A (USB ID 0x06da:0x0601)
REDi Blazer 400VA / 600VA / 800VA
UNITEK Alpha650ipF and Alpha650ipE (USB ID 0x0f03:0x0001)
- mge-shut driver has been replaced by a new implementation (newmge-shut).
In case of issue with this new version, users can revert to oldmge-shut.
- First NUT virtualization package: NUT now supports integration with
VMware ESXI 5.0, through a native VIB package. This is, for the time
being, an external effort from René Garcia (refer to the Download section
on NUT website). But work is underway to improve this integration, and
include it in the NUT source tree
- IPMI support (nut-ipmipsu driver and nut-scanner): prepare for supporting
API changes in upcoming FreeIPMI versions 1.1.x and 1.2.x.
- snmp-ups now supports high precision values for APC, and more variables
- the NUT variables and commands namespace has been fixed and
completed, with the known and used variables that were missing.
- more bugfixes, cleanup and improvements, on both source code and
documentation.
---------------------------------------------------------------------------
Release notes for NUT 2.6.4 - what's new since 2.6.3:
@ -168,10 +217,10 @@ Release notes for NUT 2.6.3 - what's new since 2.6.2:
progress.
- Compilation on IBM Aix has been fixed (namespace conflict with ctypes).
- more bugfixes, cleanup and improvements, on both source code and
documentation.
---------------------------------------------------------------------------
Release notes for NUT 2.6.2 - what's new since 2.6.1:

View file

@ -7,11 +7,19 @@ This file lists changes that affect users who installed older versions
of this software. When upgrading from an older version, be sure to
check this file to see if you need to make changes to your system.
Changes from 2.6.4 to 2.6.5
---------------------------
- users are encouraged to update to NUT 2.6.5, to fix a regression in
upssched.
- mge-shut driver has been replaced by a new implementation (newmge-shut).
In case of issue with this new version, users can revert to oldmge-shut.
Changes from 2.6.3 to 2.6.4
---------------------------
- users are encouraged to update to NUT 2.6.4, to fix upsd vulnerability
(CVE-2012-2944: upsd can be remotely crashed)
(CVE-2012-2944: upsd can be remotely crashed).
- users of the bestups driver are encouraged to switch to blazer_ser,
since bestups will soon be deprecated.

View file

@ -204,6 +204,12 @@ CFLAGS = @CFLAGS@
CONFPATH = @CONFPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBLATEX = @DBLATEX@
DEFS = @DEFS@
@ -307,6 +313,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@

View file

@ -694,7 +694,7 @@ static void sendcmd(const char *cmd, const char *arg1, const char *arg2)
snprintfcat(buf, sizeof(buf), " \"%s\"",
pconf_encode(arg2, enc, sizeof(enc)));
snprintfcat(enc, sizeof(enc), "%s\n", buf);
snprintf(enc, sizeof(enc), "%s\n", buf);
/* see if the parent needs to be started (and maybe start it) */

View file

@ -110,6 +110,12 @@ CFLAGS = @CFLAGS@
CONFPATH = @CONFPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBLATEX = @DBLATEX@
DEFS = @DEFS@
@ -213,6 +219,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@

View file

@ -115,6 +115,12 @@ CFLAGS = @CFLAGS@
CONFPATH = @CONFPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBLATEX = @DBLATEX@
DEFS = @DEFS@
@ -218,6 +224,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@

4629
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -3,7 +3,7 @@ dnl | Network UPS Tools: configure.in |
dnl +------------------------------------------------------------------+
dnl NUT version number is defined here and *only* here (no more include/version)
AC_INIT(nut, 2.6.4)
AC_INIT(nut, 2.6.5)
AC_CONFIG_SRCDIR(server/upsd.c)
AC_CONFIG_MACRO_DIR([m4])
echo "Network UPS Tools version ${PACKAGE_VERSION}"
@ -89,6 +89,7 @@ AC_PROG_CC
dnl Needed for per-target flags
AM_PROG_CC_C_O
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_EGREP
AC_PATH_PROG(AR, ar)
@ -113,6 +114,19 @@ AC_CHECK_FUNCS(vsnprintf snprintf, [], [
AC_REPLACE_FUNCS(setenv strerror atexit)
dnl
dnl Tests for CppUnit availability and usability
dnl Using CppUnit implies C++ support!
dnl Theoretically, libcppunit-dev will pull up to g++, through libstdc++...
dnl AM_PATH_CPPUNIT(1.9.6)
PKG_CHECK_MODULES(CPPUNIT, cppunit, have_cppunit=yes, have_cppunit=no)
if test "${have_cppunit}" != "yes" ; then
AC_MSG_WARN([libcppunit not found.])
fi
AM_CONDITIONAL(HAVE_CPPUNIT, test "${have_cppunit}" = "yes")
dnl
dnl Only use these when compiling with gcc
dnl
@ -415,6 +429,25 @@ AM_CONDITIONAL(WITH_FREEIPMI, test "${nut_with_freeipmi}" = "yes")
dnl AM_CONDITIONAL(WITH_OPENIPMI, test "${nut_with_openipmi}" = "yes")
dnl ----------------------------------------------------------------------
dnl The Mac OS X meta-driver looks at IOKit Power Sources keys managed by
dnl the internal USB UPS driver.
dnl
dnl FIXME: be slightly more clever here:
NUT_ARG_WITH([macosx_ups], [build and install Mac OS X Power Sources meta-driver], [auto])
if test "${nut_with_macosx_ups}" != no; then
if test -d /System/Library/Frameworks/IOKit.framework/ ; then
nut_with_macosx_ups="yes"
else
nut_with_macosx_ups="no"
fi
fi
NUT_REPORT_FEATURE([build Mac OS X meta-driver],
[${nut_with_macosx_ups}], [${nut_macosx_ups_lib}],
[WITH_MACOSX], [Define to enable Mac OS X meta-driver])
dnl ----------------------------------------------------------------------
dnl Check for --with-ssl
@ -482,6 +515,10 @@ fi
NUT_REPORT_FEATURE([enable libltdl (Libtool dlopen abstraction) support], [${nut_with_libltdl}], [],
[WITH_LIBLTDL], [Define to enable libltdl (Libtool dlopen abstraction) support])
dnl Explicitely report if we are building nut-scanner or not
dnl since it requires libltdl
NUT_REPORT([build nut-scanner], [${nut_with_libltdl}])
dnl ----------------------------------------------------------------------
dnl checks related to --with-cgi
@ -945,9 +982,13 @@ AC_ARG_WITH([systemdsystemunitdir],
;;
esac
], [])
dnl Override installation directory, with the local installation
dnl prefix. This is needed for 'distcheck*' targets, otherwise
dnl files will try to get intalled to the actual system directories
if test -n "${systemdsystemunitdir}"; then
systemdsystemshutdowndir="/lib/systemd/system-shutdown"
systemdsystemshutdowndir="${libdir}/systemd/system-shutdown"
AC_MSG_RESULT(using ${systemdsystemunitdir})
systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`"
else
AC_MSG_RESULT(no)
fi
@ -1143,6 +1184,7 @@ AC_OUTPUT([
server/Makefile
tools/Makefile
tools/nut-scanner/Makefile
tests/Makefile
Makefile
])

View file

@ -151,6 +151,12 @@ CFLAGS = @CFLAGS@
CONFPATH = @CONFPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBLATEX = @DBLATEX@
DEFS = @DEFS@
@ -254,6 +260,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@

View file

@ -199,16 +199,16 @@
"Cyclades" "pdu" "1" "PM8" "8 outlets" "powerman-pdu (experimental)"
"Cyclades" "pdu" "1" "PM10" "10 outlets" "powerman-pdu (experimental)"
"Dell" "ups" "5" "Tower 500W LV / HV" "Serial port" "newmge-shut"
"Dell" "ups" "5" "Rack/Tower 1000W LV / HV" "Serial port" "newmge-shut"
"Dell" "ups" "5" "Rack/Tower 1500W LV" "Serial port" "newmge-shut"
"Dell" "ups" "5" "Rack/Tower 1920W LV / HV" "Serial port" "newmge-shut"
"Dell" "ups" "5" "Rack/Tower 2300W LV" "Serial port" "newmge-shut"
"Dell" "ups" "5" "Rack/Tower 2700W LV / HV" "Serial port" "newmge-shut"
"Dell" "ups" "5" "Short Depth Rack 2700W Online LV / HV" "High Efficiency, Serial port" "newmge-shut"
"Dell" "ups" "5" "Rack 3750W High Efficiency Online HV" "Serial port" "newmge-shut"
"Dell" "ups" "5" "Rack 4200W High Efficiency Online HV" "Serial port" "newmge-shut"
"Dell" "ups" "5" "Rack 5600W HV" "Serial port" "newmge-shut"
"Dell" "ups" "5" "Tower 500W LV / HV" "Serial port" "mge-shut"
"Dell" "ups" "5" "Rack/Tower 1000W LV / HV" "Serial port" "mge-shut"
"Dell" "ups" "5" "Rack/Tower 1500W LV" "Serial port" "mge-shut"
"Dell" "ups" "5" "Rack/Tower 1920W LV / HV" "Serial port" "mge-shut"
"Dell" "ups" "5" "Rack/Tower 2300W LV" "Serial port" "mge-shut"
"Dell" "ups" "5" "Rack/Tower 2700W LV / HV" "Serial port" "mge-shut"
"Dell" "ups" "5" "Short Depth Rack 2700W Online LV / HV" "High Efficiency, Serial port" "mge-shut"
"Dell" "ups" "5" "Rack 3750W High Efficiency Online HV" "Serial port" "mge-shut"
"Dell" "ups" "5" "Rack 4200W High Efficiency Online HV" "Serial port" "mge-shut"
"Dell" "ups" "5" "Rack 5600W HV" "Serial port" "mge-shut"
"Dell" "ups" "5" "Tower 500W LV / HV" "USB port" "usbhid-ups"
"Dell" "ups" "5" "Rack/Tower 1000W LV / HV" "USB port" "usbhid-ups"
"Dell" "ups" "5" "Rack/Tower 1500W LV" "USB port" "usbhid-ups"
@ -251,17 +251,17 @@
"Eaton" "ups" "5" "MX 5/8/10/15/20 kVA" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "5 PX" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "Nova AVR 625/1250" "USB" "usbhid-ups"
"Eaton" "ups" "5" "Ellipse ASR USBS 600/750/1000/1500 VA" "Serial cable" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "Ellipse MAX USBS 600/850/1100/1500 VA" "Serial cable" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "Evolution 650/850/1150/1550/2000 VA" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "Evolution S 1250/1750/2500/3000 VA" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "EX 700/1000/1500 VA" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "EX 2200/3000/3000 XL VA" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "EX 1000 RT2U / 1500 RT2U" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "MX 5/8/10/15/20 kVA" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "5 PX" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "EX RT 1:1 7/11 kVA" "" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "EX RT 3:1 5/7/11 kVA" "" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "Ellipse ASR USBS 600/750/1000/1500 VA" "Serial cable" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "Ellipse MAX USBS 600/850/1100/1500 VA" "Serial cable" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "Evolution 650/850/1150/1550/2000 VA" "Serial port" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "Evolution S 1250/1750/2500/3000 VA" "Serial port" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "EX 700/1000/1500 VA" "Serial port" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "EX 2200/3000/3000 XL VA" "Serial port" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "EX 1000 RT2U / 1500 RT2U" "Serial port" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "MX 5/8/10/15/20 kVA" "Serial port" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "5 PX" "Serial port" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "EX RT 1:1 7/11 kVA" "" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "EX RT 3:1 5/7/11 kVA" "" "mge-shut or oldmge-shut"
"Eaton" "ups" "5" "EX RT (XML/HTTP)" "NMC Transverse card (ref 66074)" "netxml-ups (experimental)"
"Eaton" "ups" "5" "EX RT (SNMP)" "NMC Transverse card (ref 66074)" "snmp-ups (experimental)"
"Eaton" "ups" "5" "E Series NV UPS 400-2000 VA" "" "blazer_usb"
@ -273,7 +273,8 @@
"Eaton" "ups" "5" "various models (XML/HTTP mode)" "SNMP/Web Minislot card (ref 66244)" "netxml-ups (experimental)"
"Eaton" "ups" "5" "various models (SNMP mode)" "SNMP/Web Minislot card (ref 66244)" "snmp-ups (experimental)"
"Eaton" "ups" "5" "various models (serial mode)" "Management Card Contact (ref 66104)" "mge-shut or mge-utalk"
"Eaton" "pdu" "5" "ePDU Managed" "" "snmp-ups (experimental)"
"Eaton" "pdu" "5" "ePDU Managed" "" "snmp-ups"
"Eaton" "pdu" "5" "ePDU Switched" "" "snmp-ups"
"Eaton" "pdu" "5" "ePDU Monitored" "" "snmp-ups or netxml-ups"
"Eaton" "ups" "5" "Powerware 9130" "" "bcmxcp or usbhid-ups"
"Eaton" "ups" "5" "Powerware 9140" "" "bcmxcp or usbhid-ups"
@ -353,8 +354,8 @@
"HP" "ups" "4" "R3000 XR" "" "bcmxcp"
"HP" "ups" "4" "R5500 XR" "" "bcmxcp"
"HP" "ups" "3" "T500 / T750" "older models, USB port" "bcmxcp_usb"
"HP" "ups" "3" "R/T3000" "Serial port" "mge-shut or newmge-shut"
"HP" "ups" "3" "R5000 / R7000" "Serial port" "mge-shut or newmge-shut"
"HP" "ups" "3" "R/T3000" "Serial port" "mge-shut or oldmge-shut"
"HP" "ups" "3" "R5000 / R7000" "Serial port" "mge-shut or oldmge-shut"
"HP" "ups" "3" "T750 INTL" "" "usbhid-ups"
"HP" "ups" "3" "T1000 INTL" "" "usbhid-ups"
"HP" "ups" "3" "T1500 INTL" "" "usbhid-ups"
@ -492,15 +493,15 @@
"MGE Office Protection Systems" "ups" "5" "Pulsar 700/1000/1500 VA" "USB port" "usbhid-ups"
"MGE Office Protection Systems" "ups" "5" "Pulsar M 2200/3000 VA" "USB port" "usbhid-ups"
"MGE Office Protection Systems" "ups" "5" "Pulsar MX 5/8/10/15/20 kVA" "USB port" "usbhid-ups"
"MGE Office Protection Systems" "ups" "5" "Ellipse ASR USBS 600/750/1000/1500 VA" "Serial cable" "mge-shut or newmge-shut"
"MGE Office Protection Systems" "ups" "5" "Ellipse MAX USBS 600/850/1100/1500 VA" "Serial cable" "mge-shut or newmge-shut"
"MGE Office Protection Systems" "ups" "5" "Evolution 650/850/1150/1550/2000 VA" "Serial port" "mge-shut or newmge-shut"
"MGE Office Protection Systems" "ups" "5" "Evolution S 1250/1750/2500/3000 VA" "Serial port" "mge-shut or newmge-shut"
"MGE Office Protection Systems" "ups" "5" "Pulsar 700/1000/1500 VA" "Serial port" "mge-shut or newmge-shut"
"MGE Office Protection Systems" "ups" "5" "Pulsar M 2200/3000 VA" "Serial port" "mge-shut or newmge-shut"
"MGE Office Protection Systems" "ups" "5" "Pulsar MX 5/8/10/15/20 kVA" "Serial port" "mge-shut or newmge-shut"
"MGE Office Protection Systems" "ups" "5" "Comet EX RT 1:1 7/11 kVA" "" "mge-shut or newmge-shut"
"MGE Office Protection Systems" "ups" "5" "Comet EX RT 3:1 5/7/11 kVA" "" "mge-shut or newmge-shut"
"MGE Office Protection Systems" "ups" "5" "Ellipse ASR USBS 600/750/1000/1500 VA" "Serial cable" "mge-shut or oldmge-shut"
"MGE Office Protection Systems" "ups" "5" "Ellipse MAX USBS 600/850/1100/1500 VA" "Serial cable" "mge-shut or oldmge-shut"
"MGE Office Protection Systems" "ups" "5" "Evolution 650/850/1150/1550/2000 VA" "Serial port" "mge-shut or oldmge-shut"
"MGE Office Protection Systems" "ups" "5" "Evolution S 1250/1750/2500/3000 VA" "Serial port" "mge-shut or oldmge-shut"
"MGE Office Protection Systems" "ups" "5" "Pulsar 700/1000/1500 VA" "Serial port" "mge-shut or oldmge-shut"
"MGE Office Protection Systems" "ups" "5" "Pulsar M 2200/3000 VA" "Serial port" "mge-shut or oldmge-shut"
"MGE Office Protection Systems" "ups" "5" "Pulsar MX 5/8/10/15/20 kVA" "Serial port" "mge-shut or oldmge-shut"
"MGE Office Protection Systems" "ups" "5" "Comet EX RT 1:1 7/11 kVA" "" "mge-shut or oldmge-shut"
"MGE Office Protection Systems" "ups" "5" "Comet EX RT 3:1 5/7/11 kVA" "" "mge-shut or oldmge-shut"
"MGE Office Protection Systems" "ups" "5" "Comet EX RT (XML/HTTP)" "NMC Transverse card (ref 66074)" "netxml-ups (experimental)"
"MGE Office Protection Systems" "ups" "5" "Comet EX RT (SNMP)" "NMC Transverse card (ref 66074)" "snmp-ups (experimental)"
"MGE Office Protection Systems" "ups" "5" "various models (XML/HTTP mode)" "NMC Minislot (Ref 66102)" "netxml-ups (experimental)"
@ -548,45 +549,45 @@
"MGE UPS SYSTEMS" "ups" "5" "Pulsar MX 4000 RT" "USB" "usbhid-ups"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar MX 5000 RT" "USB" "usbhid-ups"
"MGE UPS SYSTEMS" "ups" "5" "Comet / Galaxy (USB)" "USB Card (ref 66067)" "usbhid-ups"
"MGE UPS SYSTEMS" "ups" "5" "NOVA AVR 600 Serial" "" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "NOVA AVR 1100 Serial" "" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Ellipse USBS" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Ellipse S" "" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Ellipse Premium USBS" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Ellipse Premium S" "" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse Office 600" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse Office 750" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse Office 1000" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse Office 1500" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse MAX 600" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse MAX 850" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse MAX 1100" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse MAX 1500" "Serial cable" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar EXtreme C / EX RT" "" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Comet EX RT" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Comet EX RT 3:1" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Esprit" "" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 650" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 850" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 1150" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution S 1250" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 1550" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution S 1750" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 2000" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution S 2500" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution S 3000" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar M 2200" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar M 3000" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar M 3000 XL" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 700" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 1000" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 1500" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 1000 RT2U" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 1500 RT2U" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar MX 4000 RT" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar MX 5000 RT" "Serial port" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Evolution" "Serial port" "mge-shut or newmge-shut or mge-utalk"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar EXtreme C" "" "mge-shut or newmge-shut or mge-utalk"
"MGE UPS SYSTEMS" "ups" "5" "NOVA AVR 600 Serial" "" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "NOVA AVR 1100 Serial" "" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Ellipse USBS" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Ellipse S" "" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Ellipse Premium USBS" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Ellipse Premium S" "" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse Office 600" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse Office 750" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse Office 1000" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse Office 1500" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse MAX 600" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse MAX 850" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse MAX 1100" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Ellipse MAX 1500" "Serial cable" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar EXtreme C / EX RT" "" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Comet EX RT" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Comet EX RT 3:1" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Esprit" "" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 650" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 850" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 1150" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution S 1250" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 1550" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution S 1750" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution 2000" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution S 2500" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Evolution S 3000" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar M 2200" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar M 3000" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar M 3000 XL" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 700" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 1000" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 1500" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 1000 RT2U" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar 1500 RT2U" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar MX 4000 RT" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar MX 5000 RT" "Serial port" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar Evolution" "Serial port" "mge-shut or oldmge-shut or mge-utalk"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar EXtreme C" "" "mge-shut or oldmge-shut or mge-utalk"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar ES+" "" "mge-utalk"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar ESV+" "" "mge-utalk"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar SV" "" "mge-utalk"
@ -598,7 +599,7 @@
"MGE UPS SYSTEMS" "ups" "5" "Pulsar EXtreme" "" "mge-utalk"
"MGE UPS SYSTEMS" "ups" "5" "Comet EXtreme" "" "mge-utalk"
"MGE UPS SYSTEMS" "ups" "5" "Comet / Galaxy (Serial)" "Utalk Serial Card (ref 66060)" "mge-utalk"
"MGE UPS SYSTEMS" "ups" "5" "Comet / Galaxy (Serial)" "HID COM Serial Card (ref 66066)" "mge-shut or newmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Comet / Galaxy (Serial)" "HID COM Serial Card (ref 66066)" "mge-shut or oldmge-shut"
"MGE UPS SYSTEMS" "ups" "5" "Pulsar / Comet / Galaxy (SNMP)" "SNMP/Web Transverse card (ref 66074)" "snmp-ups (experimental)"
"MGE UPS SYSTEMS" "ups" "5" "various models (XML/HTTP mode)" "NMC Minislot (Ref 66102)" "netxml-ups (experimental)"
"MGE UPS SYSTEMS" "ups" "5" "various models (SNMP mode)" "NMC Minislot (Ref 66102)" "snmp-ups (experimental)"
@ -677,6 +678,7 @@
"Oneac" "ups" "1" "ON2000XIU" "advanced interface" "oneac"
"Online" "ups" "1" "P-Series" "" "genericups upstype=14"
"Online" "ups" "2" "Zinto A" "" "blazer_usb"
"Online" "ups" "1" "Zinto D" "" "optiups"
"Online" "ups" "2" "Yunto YQ450" "" "blazer_usb"
@ -704,7 +706,7 @@
"Powercom" "ups" "4" "Imperial" "" "powercom"
"Powercom" "ups" "5" "Imperial" "USB (2009 models, product id: 00a2)" "usbhid-ups (experimental)"
"Powercom" "ups" "4" "Vanguard" "" "blazer_ser"
"Powercom" "ups" "5" "Vanguard" "USB (2009 models, product id: 00a5)" "usbhid-ups (experimental)"
"Powercom" "ups" "5" "Vanguard" "USB (2009 models, product id: 0004 or 00a5)" "usbhid-ups (experimental)"
"Powercom" "ups" "4" "WOW" "USB (<= 2009 models, product id: 0002)" "powercom (requires 'usbserial' kernel module)"
"Powercom" "ups" "5" "WOW" "USB (2009 models, product id: 00a4)" "usbhid-ups (experimental)"
"Powercom" "ups" "4" "(various)" "USB (<= 2009 models, product id: 0002)" "powercom (requires 'usbserial' kernel module)"
@ -767,6 +769,8 @@
"Raritan" "pdu" "3" "Metered PDU - Raritan PM" "no report, but should be supported" "snmp-ups (experimental)"
"Raritan" "pdu" "3" "Switched PDU - Raritan RPC" "no report, but should be supported" "snmp-ups (experimental)"
"REDi" "ups" "2" "Blazer 400VA / 600VA / 800VA" "" "blazer_ser"
"Repotec" "ups" "1" "RPF525/625/800/1000" "" "safenet"
"Repotec" "ups" "1" "RPT-800A" "" "genericups upstype=13"
"Repotec" "ups" "1" "RPT-162A" "" "genericups upstype=13"
@ -852,6 +856,8 @@
"UNITEK" "ups" "2" "Alpha 1000is" "" "blazer_ser"
"UNITEK" "ups" "2" "Alpha 500" "" "blazer_ser"
"UNITEK" "ups" "2" "Alpha 500 ipE" "" "blazer_ser"
"UNITEK" "ups" "2" "Alpha650ipF" "USB" "blazer_usb"
"UNITEK" "ups" "2" "Alpha650ipE" "USB" "blazer_usb"
"UNITEK" "ups" "2" "Alpha 2600" "" "blazer_ser"
"UNITEK" "ups" "2" "Alpha 1200Sx" "USB" "blazer_usb"
"UNITEK" "ups" "2" "Alpha 1250xD" "USB" "blazer_usb"

View file

@ -110,6 +110,12 @@ CFLAGS = @CFLAGS@
CONFPATH = @CONFPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBLATEX = @DBLATEX@
DEFS = @DEFS@
@ -213,6 +219,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@

View file

@ -1,5 +1,5 @@
IMAGE_FILES = images/asciidoc.png \
images/eaton-logo.png \
images/hostedby.png \
images/nut_layering.png \
images/nut-logo.png \
images/note.png \

View file

@ -124,6 +124,12 @@ CFLAGS = @CFLAGS@
CONFPATH = @CONFPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBLATEX = @DBLATEX@
DEFS = @DEFS@
@ -227,6 +233,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
@ -285,7 +292,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
udevdir = @udevdir@
IMAGE_FILES = images/asciidoc.png \
images/eaton-logo.png \
images/hostedby.png \
images/nut_layering.png \
images/nut-logo.png \
images/note.png \

View file

@ -122,6 +122,10 @@ and use HAL support.
Build and install Avahi support, to publish NUT server availability
using mDNS protocol.
--with-libltdl (default: auto-detect)
Enable libltdl (Libtool dlopen abstraction) support.
This is required to build nut-scanner.
Other configuration options
---------------------------
@ -331,14 +335,16 @@ or higher installed properly. The gdlib-config script will be
detected and used by default in that situation.
--with-ssl-includes, --with-usb-includes, --with-snmp-includes,
--with-neon-includes, --with-powerman-includes="-I/foo/bar"
--with-neon-includes, --with-libltdl-includes,
--with-powerman-includes="-I/foo/bar"
If your system doesn't have pkg-config and support for any of the above
libraries isn't found (but you know it is installed), you must specify the
compiler flags that are needed.
--with-ssl-libs, --with-usb-libs, --with-snmp-libs,
--with-neon-libs, --with-powerman-libs="-L/foo/bar -labcd -lxyz"
--with-neon-libs, --with-libltdl-libs
--with-powerman-libs="-L/foo/bar -labcd -lxyz"
If your system doesn't have pkg-config and support for any of the above
libraries isn't found (but you know it is installed), you must specify the

View file

@ -46,6 +46,7 @@ These are general information about UPS and PDU.
- link:http://tldp.org/HOWTO/UPS-HOWTO/[UPS HOWTO] (The Linux Documentation Project)
- link:http://en.wikipedia.org/wiki/Uninterruptible_power_supply[UPS on Wikipedia]
- link:http://en.wikipedia.org/wiki/Power_distribution_unit[PDU on Wikipedia]
- link:http://en.wikipedia.org/wiki/Solar_controller[Solar controller on Wikipedia]
- link:http://www.pcguide.com/ref/power/ext/ups/over.htm[UPS on The PC Guide]
These are writeups by users of the software.

View file

@ -115,7 +115,7 @@ link:http://pdb.finkproject.org/pdb/package.php/nut[Fink],
link:http://trac.macports.org/browser/trunk/dports/sysutils/nut/Portfile[MacPorts]
- Windows (complete port, Beta):
link:http://www.networkupstools.org/source/2.6/NUT-Installer-2.6.3-3.msi[Windows MSI installer 2.6.3-3]
link:http://www.networkupstools.org/source/2.6/NUT-Installer-2.6.4-1.msi[Windows MSI installer 2.6.4-1]
Java packages
@ -126,3 +126,14 @@ link:http://www.networkupstools.org/package/java/jNut-0.2-SNAPSHOT.tar.gz[jNUT 0
- NUT Java Web support (client side using REST, Beta)
link:http://www.networkupstools.org/package/java/jNutWebAPI-0.2-SNAPSHOT-src.tar.gz[jNutWebAPI 0.2-SNAPSHOT (sources)]
Virtualization packages
-----------------------
VMware
~~~~~~
- NUT client for ESXI 5.0 (offsite, René Garcia)
* link:http://rene.margar.fr/2012/05/client-nut-pour-esxi-5-0/[blog entry (French)]
* link:http://rene.margar.fr/downloads/NutClient-ESXi500-1.0.2.tar.gz[VIB package]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

BIN
docs/images/hostedby.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -417,6 +417,15 @@ endif
HTML_IPMIPSU_MANS = nut-ipmipsu.html
SRC_MACOSX_PAGES = macosx-ups.txt
MAN_MACOSX_PAGES = macosx-ups.8
if WITH_MACOSX
man8_MANS += $(MAN_MACOSX_PAGES)
endif
HTML_MACOSX_MANS = macosx-ups.html
# SOME_DRIVERS
endif
@ -433,7 +442,8 @@ MAN_MANS = \
$(MAN_USB_LIBUSB_PAGES) \
$(MAN_NETXML_PAGES) \
$(MAN_POWERMAN_PAGES) \
$(MAN_IPMIPSU_PAGES)
$(MAN_IPMIPSU_PAGES) \
$(MAN_MACOSX_PAGES)
# distribute everything, even those not installed by default
# Note that 'dist' target requires AsciiDoc!
@ -449,6 +459,7 @@ EXTRA_DIST = \
$(SRC_NETXML_PAGES) \
$(SRC_POWERMAN_PAGES) \
$(SRC_IPMIPSU_PAGES) \
$(SRC_MACOSX_PAGES) \
$(MAN_MANS) \
asciidoc.conf
@ -463,7 +474,8 @@ HTML_MANS = \
$(HTML_USB_LIBUSB_MANS) \
$(HTML_NETXML_MANS) \
$(HTML_POWERMAN_MANS) \
$(HTML_IPMIPSU_MANS)
$(HTML_IPMIPSU_MANS) \
$(HTML_MACOSX_MANS)
all:

View file

@ -61,6 +61,7 @@ target_triplet = @target@
@SOME_DRIVERS_FALSE@@WITH_NEON_TRUE@am__append_7 = $(MAN_NETXML_PAGES)
@SOME_DRIVERS_FALSE@@WITH_LIBPOWERMAN_TRUE@am__append_8 = $(MAN_POWERMAN_PAGES)
@SOME_DRIVERS_FALSE@@WITH_IPMI_TRUE@am__append_9 = $(MAN_IPMIPSU_PAGES)
@SOME_DRIVERS_FALSE@@WITH_MACOSX_TRUE@am__append_10 = $(MAN_MACOSX_PAGES)
subdir = docs/man
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -140,6 +141,12 @@ CFLAGS = @CFLAGS@
CONFPATH = @CONFPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
CPPUNIT_LIBS = @CPPUNIT_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBLATEX = @DBLATEX@
DEFS = @DEFS@
@ -243,6 +250,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
@ -352,7 +360,7 @@ MAN_CLIENT_PAGES = \
man8_MANS = $(MAN_CLIENT_PAGES) $(MAN_TOOL_PAGES) $(am__append_2) \
$(am__append_3) $(am__append_4) $(am__append_5) \
$(am__append_6) $(am__append_7) $(am__append_8) \
$(am__append_9)
$(am__append_9) $(am__append_10)
HTML_CLIENT_MANS = \
nutupsdrv.html \
upsc.html \
@ -656,6 +664,9 @@ HTML_DEV_MANS = \
@SOME_DRIVERS_FALSE@SRC_IPMIPSU_PAGES = nut-ipmipsu.txt
@SOME_DRIVERS_FALSE@MAN_IPMIPSU_PAGES = nut-ipmipsu.8
@SOME_DRIVERS_FALSE@HTML_IPMIPSU_MANS = nut-ipmipsu.html
@SOME_DRIVERS_FALSE@SRC_MACOSX_PAGES = macosx-ups.txt
@SOME_DRIVERS_FALSE@MAN_MACOSX_PAGES = macosx-ups.8
@SOME_DRIVERS_FALSE@HTML_MACOSX_MANS = macosx-ups.html
# SOME_DRIVERS
MAN_MANS = \
@ -671,7 +682,8 @@ MAN_MANS = \
$(MAN_USB_LIBUSB_PAGES) \
$(MAN_NETXML_PAGES) \
$(MAN_POWERMAN_PAGES) \
$(MAN_IPMIPSU_PAGES)
$(MAN_IPMIPSU_PAGES) \
$(MAN_MACOSX_PAGES)
# distribute everything, even those not installed by default
@ -688,6 +700,7 @@ EXTRA_DIST = \
$(SRC_NETXML_PAGES) \
$(SRC_POWERMAN_PAGES) \
$(SRC_IPMIPSU_PAGES) \
$(SRC_MACOSX_PAGES) \
$(MAN_MANS) \
asciidoc.conf
@ -702,7 +715,8 @@ HTML_MANS = \
$(HTML_USB_LIBUSB_MANS) \
$(HTML_NETXML_MANS) \
$(HTML_POWERMAN_MANS) \
$(HTML_IPMIPSU_MANS)
$(HTML_IPMIPSU_MANS) \
$(HTML_MACOSX_MANS)
CLEANFILES = *.xml *.html
SUFFIXES = .txt .html .1 .3 .5 .8

View file

@ -2,12 +2,12 @@
.\" Title: apcsmart-old
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "APCSMART\-OLD" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "APCSMART\-OLD" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: apcsmart
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "APCSMART" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "APCSMART" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: bcmxcp
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "BCMXCP" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "BCMXCP" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: bcmxcp_usb
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "BCMXCP_USB" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "BCMXCP_USB" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: belkin
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "BELKIN" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "BELKIN" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: belkinunv
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "BELKINUNV" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "BELKINUNV" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -111,7 +111,7 @@ option is given, each status update is written on a new line\&.
not supported by all hardware\&.
.RE
.PP
\fBbattery\&.voltage\fR, \fBbattery\&.voltage\&.nominal\fR, \fBdriver\&.version\&.internal\fR, \fBinput\&.frequency\fR, \fBinput\&.frequency\&.nominal\fR
\fBbattery\&.voltage\fR, \fBbattery\&.voltage\&.nominal\fR, \fBinput\&.frequency\fR, \fBinput\&.frequency\&.nominal\fR
.RS 4
e\&.g\&. 60 for 60Hz
.RE

View file

@ -131,8 +131,6 @@ not supported by all hardware.
*battery.voltage.nominal*::
*driver.version.internal*::
*input.frequency*::
*input.frequency.nominal*::

View file

@ -2,12 +2,12 @@
.\" Title: bestfcom
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "BESTFCOM" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "BESTFCOM" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: bestfortress
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "BESTFORTRESS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "BESTFORTRESS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: bestuferrups
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "BESTUFERRUPS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "BESTUFERRUPS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: bestups
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "BESTUPS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "BESTUPS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: blazer
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "BLAZER" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "BLAZER" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: clone
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "CLONE" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "CLONE" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: dummy-ups
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "DUMMY\-UPS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "DUMMY\-UPS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: etapro
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "ETAPRO" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "ETAPRO" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: everups
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "EVERUPS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "EVERUPS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: gamatronic
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "GAMATRONIC" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "GAMATRONIC" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: genericups
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "GENERICUPS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "GENERICUPS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: hosts.conf
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "HOSTS\&.CONF" "5" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "HOSTS\&.CONF" "5" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: isbmex
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "ISBMEX" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "ISBMEX" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: ivtscd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "IVTSCD" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "IVTSCD" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: libupsclient-config
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "LIBUPSCLIENT\-CONFIG" "1" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "LIBUPSCLIENT\-CONFIG" "1" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: liebert-esp2
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "LIEBERT\-ESP2" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "LIEBERT\-ESP2" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: liebert
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "LIEBERT" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "LIEBERT" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

81
docs/man/macosx-ups.8 Normal file
View file

@ -0,0 +1,81 @@
'\" t
.\" Title: macosx-ups
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "MACOSX\-UPS" "8" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
macosx-ups \- monitor for Mac OS X built\-in UPS and battery driver
.SH "NOTE"
.sp
This man page only documents the hardware\-specific features of the \fBmacosx\-ups\fR driver\&. For information about the core driver, see \fBnutupsdrv\fR(8)\&.
.SH "SUPPORTED HARDWARE"
.sp
\fBmacosx\-ups\fR supports any USB HID Power Device Class (PDC) UPS which is matched by the Mac OS X built\-in drivers\&. It also can monitor a laptop internal battery as though it were an UPS\&.
.sp
If the UPS is visible in the Energy Saver preferences pane of System Preferences, this driver should be able to monitor it\&.
.SH "EXTRA ARGUMENTS"
.PP
\fBport\fR=\fIregex\fR
.RS 4
The
\fBport\fR
parameter in the configuration file can be a case\-insensitive extended regular expression (see
\fBregex\fR(3) for details) to match against specific UPS and battery names\&.
.sp
The traditional NUT auto\-detection value of "auto" will be changed to "/UPS"\&. To test this driver against the internal battery of a laptop, a value such as "battery" can be used\&.
.RE
.PP
\fBmodel\fR=\fIregex\fR
.RS 4
Likewise, if you have more than one UPS, it may be necessary to specify a
\fBmodel\fR
name to match against\&. This parameter is also a case\-insensitive extended regular expression\&.
.RE
.SH "DIAGNOSTICS"
.sp
If the driver cannot find an UPS, first open System Preferences and see if there is an "UPS" tab on the Energy Saver panel\&. If so, re\-run the driver with the \fB\-D\fR flag to list the names of the power sources found\&.
.SH "KNOWN ISSUES AND BUGS"
.sp
This driver is a monitoring\-only driver, and cannot shut down an UPS on its own\&. However, this should not be a problem in practice: it is monitoring the built\-in Mac OS X UPS driver, which has configuration options for several shutdown scenarios\&. Consult the Energy Saver control panel or \fBpmset\fR(8) for more information\&.
.sp
The default distribution of \fBapcupsd\fR installs a kernel extension which prevents Mac OS X from attaching to the UPS\&. In order to use this driver after installing apcupsd, you must first run the apcupsd\-uninstall script and reboot\&.
.sp
Note that other UPS monitoring solutions may show more detail than what is provided by the built\-in Mac OS X driver\&. In particular, voltages other than the battery voltage, as well as current and frequency, are typically not shown\&. It may be possible to monitor these values with \fBapcupsd\fR (for APC hardware only) or \fBusbhid-ups\fR(8)\&.
.SH "AUTHORS"
.sp
Charles Lepple <clepple+nut at gmail\&.com>
.SH "SEE ALSO"
.sp
\fBusbhid-ups\fR(8), \fBpmset\fR(8), \fBregex\fR(3)
.SS "The core driver:"
.sp
\fBnutupsdrv\fR(8)
.SS "Internet resources:"
.sp
The NUT (Network UPS Tools) home page: http://www\&.networkupstools\&.org/
.sp
The apcupsd home page: http://www\&.apcupsd\&.org/

104
docs/man/macosx-ups.txt Normal file
View file

@ -0,0 +1,104 @@
MACOSX-UPS(8)
=============
NAME
----
macosx-ups - monitor for Mac OS X built-in UPS and battery driver
NOTE
----
This man page only documents the hardware-specific features of the
*macosx-ups* driver. For information about the core driver, see
linkman:nutupsdrv[8].
SUPPORTED HARDWARE
------------------
*macosx-ups* supports any USB HID Power Device Class (PDC) UPS which is
matched by the Mac OS X built-in drivers. It also can monitor a laptop
internal battery as though it were an UPS.
If the UPS is visible in the Energy Saver preferences pane of System
Preferences, this driver should be able to monitor it.
EXTRA ARGUMENTS
----------------
*port*='regex'::
The *port* parameter in the configuration file can be a case-insensitive
extended regular expression (see *regex*(3) for details) to match against
specific UPS and battery names.
+
The traditional NUT auto-detection value of "auto" will be changed to "/UPS".
To test this driver against the internal battery of a laptop, a value such as
"battery" can be used.
*model*='regex'::
Likewise, if you have more than one UPS, it may be necessary to specify a
*model* name to match against. This parameter is also a case-insensitive
extended regular expression.
//////////////////////////////////////////
This driver also supports the following optional settings:
*option1*='num'::
Set the value of ... to 'num'. Contrast with *option2*.
*option2*='string'::
Some other option.
//////////////////////////////////////////
//////////////////////////////////////////
Optional: list supported instant commands here:
INSTANT COMMANDS
----------------
*instcmd1*::
Command 1.
//////////////////////////////////////////
DIAGNOSTICS
-----------
If the driver cannot find an UPS, first open System Preferences and see if
there is an "UPS" tab on the Energy Saver panel. If so, re-run the driver with
the *-D* flag to list the names of the power sources found.
KNOWN ISSUES AND BUGS
---------------------
This driver is a monitoring-only driver, and cannot shut down an UPS on its
own. However, this should not be a problem in practice: it is monitoring the
built-in Mac OS X UPS driver, which has configuration options for several
shutdown scenarios. Consult the Energy Saver control panel or *pmset*(8) for
more information.
The default distribution of *apcupsd* installs a kernel extension which
prevents Mac OS X from attaching to the UPS. In order to use this driver after
installing apcupsd, you must first run the `apcupsd-uninstall` script and
reboot.
Note that other UPS monitoring solutions may show more detail than what is
provided by the built-in Mac OS X driver. In particular, voltages other than
the battery voltage, as well as current and frequency, are typically not
shown. It may be possible to monitor these values with *apcupsd* (for APC
hardware only) or linkman:usbhid-ups[8].
AUTHORS
-------
Charles Lepple <clepple+nut at gmail.com>
SEE ALSO
--------
linkman:usbhid-ups[8], *pmset*(8), *regex*(3)
The core driver:
~~~~~~~~~~~~~~~~
linkman:nutupsdrv[8]
Internet resources:
~~~~~~~~~~~~~~~~~~~
The NUT (Network UPS Tools) home page: http://www.networkupstools.org/
The apcupsd home page: http://www.apcupsd.org/

View file

@ -2,12 +2,12 @@
.\" Title: masterguard
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "MASTERGUARD" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "MASTERGUARD" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: metasys
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "METASYS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "METASYS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: mge-shut
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "MGE\-SHUT" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "MGE\-SHUT" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -94,13 +94,28 @@ warn you upon startup if it isn\(cqt\&. Some UPS\(cqes will restart no matter wh
in
\fBups\&.conf\fR
helps\&.
.if n \{\
.sp
.\}
.RS 4
.it 1 an-trap
.nr an-no-space-flag 1
.nr an-break-flag 1
.br
.ps +1
\fBWarning\fR
.ps -1
.br
ondelay parameter was set in ten seconds unit in the legacy mge\-shut driver ( 3 for 30 seconds) \&. It is now set in seconds ( 30 for 30 seconds)\&. Make sure you use the correct unit in your configuration\&.
.sp .5v
.RE
.RE
.PP
\fBnotification\fR=\fInum\fR
.RS 4
Set notification type to 1 (no), 2 (light) or 3 (yes)\&.
.sp
The default value is 3 (yes) because of some early Ellipse models which need it\&.
This argument is ignored\&. It is only here for backward compatibility\&.
.RE
.SH "KNOWN ISSUES"
.SS "Repetitive timeout and staleness"

View file

@ -56,12 +56,15 @@ than offdelay, but the driver will *not* warn you upon startup if it
isn't. Some UPS'es will restart no matter what, even if the power is
(still) out at the moment this timer elapses. In that case, you could try
if setting 'ondelay = -1' in *ups.conf* helps.
+
WARNING: ondelay parameter was set in ten seconds unit in the legacy mge-shut
driver ( 3 for 30 seconds) . It is now set in seconds ( 30 for 30 seconds).
Make sure you use the correct unit in your configuration.
*notification*='num'::
Set notification type to 1 (no), 2 (light) or 3 (yes).
+
The default value is 3 (yes) because of some early Ellipse models which
need it.
This argument is ignored. It is only here for backward compatibility.
KNOWN ISSUES
------------

View file

@ -2,12 +2,12 @@
.\" Title: mge-utalk
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "MGE\-UTALK" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "MGE\-UTALK" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: microdowell
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "MICRODOWELL" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "MICRODOWELL" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: netxml-ups
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NETXML\-UPS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "NETXML\-UPS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nut-ipmipsu
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUT\-IPMIPSU" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "NUT\-IPMIPSU" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -167,7 +167,7 @@ means that the PSU is present and providing power,
.IP \(bu 2.3
.\}
\fIOB\fR
\fIOFF\fR
means that the PSU is present but not providing power (power cable removed),
.RE
.sp
@ -181,7 +181,7 @@ means that the PSU is present but not providing power (power cable removed),
.\}
\fIstale\fR
means that the PSU is not present (ie physically removed)\&.
(no data) means that the PSU is not present (ie physically removed)\&.
.RE
.RE
.sp

View file

@ -70,8 +70,8 @@ This driver will report various information related to a PSU, including:
- status of the PSU:
* 'OL' means that the PSU is present and providing power,
* 'OB' means that the PSU is present but not providing power (power cable removed),
* 'stale' means that the PSU is not present (ie physically removed).
* 'OFF' means that the PSU is present but not providing power (power cable removed),
* 'stale' (no data) means that the PSU is not present (ie physically removed).
Here is an example output for a Dell r610 server:

View file

@ -2,12 +2,12 @@
.\" Title: nut-recorder
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUT\-RECORDER" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "NUT\-RECORDER" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nut-scanner
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUT\-SCANNER" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "NUT\-SCANNER" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -39,7 +39,7 @@ nut-scanner \- scan communication buses for NUT devices
\fBnut\-scanner\fR scans available communication buses and displays any NUT\-compatible devices it has found\&.
.SH "INSTALLATION"
.sp
\fBnut\-scanner\fR is always built by default\&. However, available options (USB, SNMP, IPMI, \&...) will vary according to the available compile time and runtime dependencies\&. For example, if Net\-SNMP is installed, thus providing libsnmp (\&.so or \&.dll) and headers, both during compilation and runtime, then SNMP discovery will be available\&.
\fBnut\-scanner\fR is only built if libltdl (part of libtool development suite) is available\&. Available options (USB, SNMP, IPMI, \&...) will vary according to the available compile time and runtime dependencies\&. For example, if Net\-SNMP is installed, thus providing libsnmp (\&.so or \&.dll) and headers, both during compilation and runtime, then SNMP discovery will be available\&.
.SH "OPTIONS"
.PP
\fB\-h\fR

View file

@ -21,11 +21,11 @@ NUT-compatible devices it has found.
INSTALLATION
------------
*nut-scanner* is always built by default. However, available options
(USB, SNMP, IPMI, ...) will vary according to the available compile time
and runtime dependencies. For example, if Net-SNMP is installed, thus
providing libsnmp (.so or .dll) and headers, both during compilation
and runtime, then SNMP discovery will be available.
*nut-scanner* is only built if libltdl (part of libtool development suite)
is available. Available options (USB, SNMP, IPMI, ...) will vary according
to the available compile time and runtime dependencies. For example, if
Net-SNMP is installed, thus providing libsnmp (.so or .dll) and headers,
both during compilation and runtime, then SNMP discovery will be available.
OPTIONS
-------

View file

@ -2,12 +2,12 @@
.\" Title: nut.conf
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUT\&.CONF" "5" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "NUT\&.CONF" "5" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -33,10 +33,10 @@ nutscan \- Network UPS Tools (NUT) device discovery library
.sp
The Network UPS Tools (NUT) \fBnutscan\fR library provides the same discovery related features that are also offered by \fBnut-scanner\fR(8)\&.
.sp
It allows to discover supported NUT devices (USB, SNMP, Eaton XML/HTTP and IPMI) and NUT servers (using Avahi or the classic connection method)\&.
It enables the discovery of supported NUT devices (USB, SNMP, Eaton XML/HTTP and IPMI) and NUT servers (using Avahi, or the classic connection method)\&.
.SH "DISCOVERY FUNCTIONS"
.sp
First, include the needed header file:
First, include the required header file:
.sp
.if n \{\
.RS 4
@ -128,9 +128,9 @@ for NUT servers (upsd), using the mDNS (Avahi) method,
for supported IPMI PSU\&.
.RE
.sp
All these functions return a list of devices found, using the nutscan_device_t structure\&. This one is described in \fBnutscan_add_device_to_device\fR(3)\&.
All of these functions return a list of devices found, using the nutscan_device_t structure\&. This structure is described in \fBnutscan_add_device_to_device\fR(3)\&.
.sp
Helper functions are also provided to output data using standard format:
Helper functions are also provided to output data using standard formats:
.sp
.RS 4
.ie n \{\
@ -159,7 +159,7 @@ for ups\&.conf style\&.
.RE
.SH "ERROR HANDLING"
.sp
There is currently no specific mechanism around error handling\&.
There is currently no specific mechanism for error handling\&.
.SH "SEE ALSO"
.sp
\fBnut-scanner\fR(8), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_snmp\fR(3) \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3) \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3) \fBnutscan_display_parsable\fR(3), \fBnutscan_display_ups_conf\fR(3) \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3) \fBnutscan_add_device_to_device\fR(3), \fBnutscan_add_option_to_device\fR(3) \fBnutscan_cidr_to_ip\fR(3)
\fBnut-scanner\fR(8), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_avahi\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3), http://avahi\&.org/

View file

@ -12,14 +12,14 @@ DESCRIPTION
The Network UPS Tools (NUT) *nutscan* library provides the same discovery
related features that are also offered by linkman:nut-scanner[8].
It allows to discover supported NUT devices (USB, SNMP, Eaton XML/HTTP and IPMI)
and NUT servers (using Avahi or the classic connection method).
It enables the discovery of supported NUT devices (USB, SNMP, Eaton XML/HTTP
and IPMI) and NUT servers (using Avahi, or the classic connection method).
DISCOVERY FUNCTIONS
-------------------
First, include the needed header file:
First, include the required header file:
#include <nut-scan.h>
@ -33,10 +33,10 @@ Then, to discover new devices, use the appropriate function:
- linkman:nutscan_scan_ipmi[3] for supported IPMI PSU.
All these functions return a list of devices found, using the nutscan_device_t
structure. This one is described in linkman:nutscan_add_device_to_device[3].
All of these functions return a list of devices found, using the nutscan_device_t
structure. This structure is described in linkman:nutscan_add_device_to_device[3].
Helper functions are also provided to output data using standard format:
Helper functions are also provided to output data using standard formats:
- linkman:nutscan_display_parsable[3] for parsable output,
- linkman:nutscan_display_ups_conf[3] for ups.conf style.
@ -44,16 +44,17 @@ Helper functions are also provided to output data using standard format:
ERROR HANDLING
--------------
There is currently no specific mechanism around error handling.
There is currently no specific mechanism for error handling.
SEE ALSO
--------
linkman:nut-scanner[8],
linkman:nutscan_scan_usb[3], linkman:nutscan_scan_snmp[3]
linkman:nutscan_scan_xml_http[3], linkman:nutscan_scan_nut[3]
linkman:nutscan_scan_avahi[3], linkman:nutscan_scan_ipmi[3]
linkman:nutscan_display_parsable[3], linkman:nutscan_display_ups_conf[3]
linkman:nutscan_new_device[3], linkman:nutscan_free_device[3]
linkman:nutscan_add_device_to_device[3], linkman:nutscan_add_option_to_device[3]
linkman:nutscan_cidr_to_ip[3]
linkman:nutscan_scan_usb[3], linkman:nutscan_scan_snmp[3],
linkman:nutscan_scan_xml_http[3], linkman:nutscan_scan_nut[3],
linkman:nutscan_scan_avahi[3], linkman:nutscan_scan_ipmi[3],
linkman:nutscan_display_parsable[3], linkman:nutscan_display_ups_conf[3],
linkman:nutscan_new_device[3], linkman:nutscan_free_device[3],
linkman:nutscan_add_device_to_device[3], linkman:nutscan_add_option_to_device[3],
linkman:nutscan_cidr_to_ip[3],
http://avahi.org/

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_add_device_to_device
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_ADD_DEVICE_T" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_ADD_DEVICE_T" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_add_option_to_device
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_ADD_OPTION_T" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_ADD_OPTION_T" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_cidr_to_ip
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_CIDR_TO_IP" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_CIDR_TO_IP" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_display_parsable
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_DISPLAY_PARS" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_DISPLAY_PARS" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_display_ups_conf
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_DISPLAY_UPS_" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_DISPLAY_UPS_" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_free_device
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_FREE_DEVICE" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_FREE_DEVICE" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_init
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_INIT" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_INIT" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_new_device
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_NEW_DEVICE" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_NEW_DEVICE" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_scan_avahi
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_SCAN_AVAHI" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_SCAN_AVAHI" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -28,7 +28,7 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
nutscan_scan_avahi \- Scan network for NUT services via AVAHI\&.
nutscan_scan_avahi \- Scan network for NUT services via mDNS
.SH "SYNOPSIS"
.sp
.nf
@ -40,14 +40,14 @@ nutscan_device_t * nutscan_scan_avahi(long usec_timeout);
.fi
.SH "DESCRIPTION"
.sp
The \fBnutscan_scan_avahi()\fR function try to detect NUT service and its associated devcies\&. It uses the AVAHI library to do so\&.
The \fBnutscan_scan_avahi()\fR function tries to detect the NUT service via mDNS, and its associated devices\&. It uses the Avahi library to do so\&.
.sp
You MUST call \fBnutscan_init\fR(3) before using this function\&.
.sp
This function waits up to \fIusec_timeout\fR microseconds before considering an IP address does not respond\&.
This function waits up to \fIusec_timeout\fR microseconds before considering an IP address to be unresponsive\&.
.SH "RETURN VALUE"
.sp
The \fBnutscan_scan_avahi()\fR function returns a pointer to a nutscan_device_t structure containing all found devices or NULL if an error occurs or no device is found\&.
The \fBnutscan_scan_avahi()\fR function returns a pointer to a nutscan_device_t structure containing all found devices\&. It returns NULL if an error occurs, or if no device is found\&.
.SH "SEE ALSO"
.sp
\fBnutscan_init\fR(3), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3)
\fBnutscan_init\fR(3), \fBnutscan_scan_usb\fR(3), \fBnutscan_scan_xml_http\fR(3), \fBnutscan_scan_nut\fR(3), \fBnutscan_scan_snmp\fR(3), \fBnutscan_scan_ipmi\fR(3), \fBnutscan_display_ups_conf\fR(3), \fBnutscan_display_parsable\fR(3), \fBnutscan_new_device\fR(3), \fBnutscan_free_device\fR(3), \fBnutscan_add_option_to_device\fR(3), \fBnutscan_add_device_to_device\fR(3), \fBnutscan_cidr_to_ip\fR(3), http://avahi\&.org/

View file

@ -4,7 +4,7 @@ NUTSCAN_SCAN_AVAHI(3)
NAME
----
nutscan_scan_avahi - Scan network for NUT services via AVAHI.
nutscan_scan_avahi - Scan network for NUT services via mDNS
SYNOPSIS
--------
@ -16,16 +16,20 @@ SYNOPSIS
DESCRIPTION
-----------
The *nutscan_scan_avahi()* function try to detect NUT service and its associated devcies. It uses the AVAHI library to do so.
The *nutscan_scan_avahi()* function tries to detect the NUT service via mDNS,
and its associated devices. It uses the Avahi library to do so.
You MUST call linkman:nutscan_init[3] before using this function.
This function waits up to 'usec_timeout' microseconds before considering an IP address does not respond.
This function waits up to 'usec_timeout' microseconds before considering an IP
address to be unresponsive.
RETURN VALUE
------------
The *nutscan_scan_avahi()* function returns a pointer to a `nutscan_device_t` structure containing all found devices or NULL if an error occurs or no device is found.
The *nutscan_scan_avahi()* function returns a pointer to a `nutscan_device_t`
structure containing all found devices. It returns NULL if an error occurs, or
if no device is found.
SEE ALSO
--------
@ -35,4 +39,5 @@ linkman:nutscan_scan_nut[3], linkman:nutscan_scan_snmp[3],
linkman:nutscan_scan_ipmi[3], linkman:nutscan_display_ups_conf[3],
linkman:nutscan_display_parsable[3], linkman:nutscan_new_device[3],
linkman:nutscan_free_device[3], linkman:nutscan_add_option_to_device[3],
linkman:nutscan_add_device_to_device[3], linkman:nutscan_cidr_to_ip[3]
linkman:nutscan_add_device_to_device[3], linkman:nutscan_cidr_to_ip[3],
http://avahi.org/

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_scan_ipmi
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_SCAN_IPMI" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_SCAN_IPMI" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_scan_nut
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_SCAN_NUT" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_SCAN_NUT" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_scan_snmp
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_SCAN_SNMP" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_SCAN_SNMP" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_scan_usb
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_SCAN_USB" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_SCAN_USB" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutscan_scan_xml_http
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTSCAN_SCAN_XML_HTT" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTSCAN_SCAN_XML_HTT" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: nutupsdrv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "NUTUPSDRV" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "NUTUPSDRV" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: oneac
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "ONEAC" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "ONEAC" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: optiups
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "OPTIUPS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "OPTIUPS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: powercom
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "POWERCOM" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "POWERCOM" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@ -28,13 +28,15 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
powercom \- UPS driver for Powercom/Trust/Advice UPS equipment
powercom \- UPS driver for serial Powercom/Trust/Advice UPS equipment
.SH "NOTE"
.sp
This man page only documents the hardware\-specific features of the powercom driver\&. For information about the core driver, see \fBnutupsdrv\fR(8)\&.
.SH "SUPPORTED HARDWARE"
.sp
This driver supports many similar kinds of UPS hardware\&. The most common ones are the Trust 425/625, Powercom, and Advice Partner/King PR750\&. Others using the same protocol may also work\&.
This driver supports many similar kinds of serial UPS hardware (as well as a few USB UPS models with USB\-to\-serial adapters)\&. The most common ones are the Trust 425/625, Powercom, and Advice Partner/King PR750\&. Others using the same protocol may also work\&. For USB connections, you might need \fBusbhid-ups\fR(8)\&.
.sp
For more specific guidance on which driver is applicable for a USB connection, see the NUT Hardware Compatibility List (HCL)\&.
.SH "EXTRA ARGUMENTS"
.sp
This driver supports the following optional settings in the \fBups.conf\fR(5) file:

View file

@ -4,7 +4,7 @@ POWERCOM(8)
NAME
----
powercom - UPS driver for Powercom/Trust/Advice UPS equipment
powercom - UPS driver for serial Powercom/Trust/Advice UPS equipment
NOTE
----
@ -14,9 +14,13 @@ linkman:nutupsdrv[8].
SUPPORTED HARDWARE
------------------
This driver supports many similar kinds of UPS hardware. The most common
ones are the Trust 425/625, Powercom, and Advice Partner/King PR750.
Others using the same protocol may also work.
This driver supports many similar kinds of serial UPS hardware (as well as a
few USB UPS models with USB-to-serial adapters). The most common ones are the
Trust 425/625, Powercom, and Advice Partner/King PR750. Others using the same
protocol may also work. For USB connections, you might need linkman:usbhid-ups[8].
For more specific guidance on which driver is applicable for a USB connection,
see the NUT Hardware Compatibility List (HCL).
EXTRA ARGUMENTS
---------------

View file

@ -2,12 +2,12 @@
.\" Title: powerman-pdu
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "POWERMAN\-PDU" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "POWERMAN\-PDU" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: powerpanel
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "POWERPANEL" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "POWERPANEL" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: rhino
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "RHINO" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "RHINO" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: richcomm_usb
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "RICHCOMM_USB" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "RICHCOMM_USB" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: safenet
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "SAFENET" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "SAFENET" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -43,6 +43,7 @@ CABLING
//////////////////////////////////////////
EXTRA ARGUMENTS
---------------
This driver also supports the following optional settings:
*option1*='num'::
@ -70,6 +71,15 @@ INSTALLATION
//////////////////////////////////////////
//////////////////////////////////////////
Optional: use DIAGNOSTICS to describe troubleshooting techniques that are
longer than what can be conveniently described in the driver error messages.
DIAGNOSTICS
-----------
//////////////////////////////////////////
//////////////////////////////////////////
You may leave this as "none known at this time", or describe any trouble
encountered when implementing the protocol for your UPS.

View file

@ -2,12 +2,12 @@
.\" Title: snmp-ups
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "SNMP\-UPS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "SNMP\-UPS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: solis
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "SOLIS" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "SOLIS" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: tripplite
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "TRIPPLITE" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "TRIPPLITE" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: tripplite_usb
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "TRIPPLITE_USB" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "TRIPPLITE_USB" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: tripplitesu
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "TRIPPLITESU" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "TRIPPLITESU" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: ups.conf
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "UPS\&.CONF" "5" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "UPS\&.CONF" "5" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: upsc
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/21/2012
.\" Date: 08/07/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "UPSC" "8" "05/21/2012" "Network UPS Tools" "NUT Manual"
.TH "UPSC" "8" "08/07/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: upscli_connect
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "UPSCLI_CONNECT" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "UPSCLI_CONNECT" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

View file

@ -2,12 +2,12 @@
.\" Title: upscli_disconnect
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 05/22/2012
.\" Date: 08/08/2012
.\" Manual: NUT Manual
.\" Source: Network UPS Tools
.\" Language: English
.\"
.TH "UPSCLI_DISCONNECT" "3" "05/22/2012" "Network UPS Tools" "NUT Manual"
.TH "UPSCLI_DISCONNECT" "3" "08/08/2012" "Network UPS Tools" "NUT Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------

Some files were not shown because too many files have changed in this diff Show more