lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.6.2

Browse source
This commit is contained in:
Arnaud Quette 2011-09-29 20:14:46 +02:00
parent a367d9bc54
commit 45043b58d0
246 changed files with 18228 additions and 1415 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scripts/udev/Makefile.am
View file

@ -1,7 +1,13 @@
if WITH_UDEV
udevrulesdir = $(udevdir)/rules.d
udevrules_DATA = 52-nut-usbups.rules
udevrules_DATA =
if WITH_USB
udevrules_DATA += 52-nut-usbups.rules
endif
if WITH_IPMI
udevrules_DATA += 52-nut-ipmipsu.rules
endif
endif
EXTRA_DIST = README
@ -9,7 +15,10 @@ EXTRA_DIST = README
52-nut-usbups.rules: nut-usbups.rules
cp nut-usbups.rules 52-nut-usbups.rules
DISTCLEANFILES = nut-usbups.rules
CLEANFILES = 52-nut-usbups.rules
52-nut-ipmipsu.rules: nut-ipmipsu.rules
cp nut-ipmipsu.rules 52-nut-ipmipsu.rules
DISTCLEANFILES = nut-usbups.rules nut-ipmipsu.rules
CLEANFILES = 52-nut-usbups.rules 52-nut-ipmipsu.rules
# we should never remove this one, apart from a distclean-check
#MAINTAINERCLEANFILES = nut-usbups.rules.in

29
scripts/udev/Makefile.in
View file

@ -35,9 +35,11 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@WITH_UDEV_TRUE@@WITH_USB_TRUE@am__append_1 = 52-nut-usbups.rules
@WITH_IPMI_TRUE@@WITH_UDEV_TRUE@am__append_2 = 52-nut-ipmipsu.rules
subdir = scripts/udev
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/nut-usbups.rules.in
$(srcdir)/nut-ipmipsu.rules.in $(srcdir)/nut-usbups.rules.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@ -45,6 +47,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nut_arg_with.m4 \
$(top_srcdir)/m4/nut_check_asciidoc.m4 \
$(top_srcdir)/m4/nut_check_libavahi.m4 \
$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
$(top_srcdir)/m4/nut_check_libgd.m4 \
$(top_srcdir)/m4/nut_check_libhal.m4 \
$(top_srcdir)/m4/nut_check_libneon.m4 \
@ -62,7 +66,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/config.h
CONFIG_CLEAN_FILES = nut-usbups.rules
CONFIG_CLEAN_FILES = nut-ipmipsu.rules nut-usbups.rules
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
@ -134,10 +138,14 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
LIBGD_CFLAGS = @LIBGD_CFLAGS@
LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
LIBHAL_LIBS = @LIBHAL_LIBS@
LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
LIBIPMI_LIBS = @LIBIPMI_LIBS@
LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
LIBNEON_LIBS = @LIBNEON_LIBS@
LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -175,6 +183,10 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORT = @PORT@
RANLIB = @RANLIB@
RUN_AS_GROUP = @RUN_AS_GROUP@
RUN_AS_USER = @RUN_AS_USER@
@ -239,6 +251,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
systemdsystemshutdowndir = @systemdsystemshutdowndir@
systemdsystemunitdir = @systemdsystemunitdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
@ -249,10 +263,10 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
udevdir = @udevdir@
@WITH_UDEV_TRUE@udevrulesdir = $(udevdir)/rules.d
@WITH_UDEV_TRUE@udevrules_DATA = 52-nut-usbups.rules
@WITH_UDEV_TRUE@udevrules_DATA = $(am__append_1) $(am__append_2)
EXTRA_DIST = README
DISTCLEANFILES = nut-usbups.rules
CLEANFILES = 52-nut-usbups.rules
DISTCLEANFILES = nut-usbups.rules nut-ipmipsu.rules
CLEANFILES = 52-nut-usbups.rules 52-nut-ipmipsu.rules
all: all-am
.SUFFIXES:
@ -286,6 +300,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
nut-ipmipsu.rules: $(top_builddir)/config.status $(srcdir)/nut-ipmipsu.rules.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
nut-usbups.rules: $(top_builddir)/config.status $(srcdir)/nut-usbups.rules.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@ -468,6 +484,9 @@ uninstall-am: uninstall-udevrulesDATA
52-nut-usbups.rules: nut-usbups.rules
cp nut-usbups.rules 52-nut-usbups.rules
52-nut-ipmipsu.rules: nut-ipmipsu.rules
cp nut-ipmipsu.rules 52-nut-ipmipsu.rules
# we should never remove this one, apart from a distclean-check
#MAINTAINERCLEANFILES = nut-usbups.rules.in

23
scripts/udev/README
View file

@ -1,17 +1,18 @@
Desc: Udev script for NUT USB drivers
Desc: Udev script for NUT USB and IPMI drivers
File: scripts/udev/README
Date: 27 January 2008
Date: 25 July 2011
Auth: Arnaud Quette <aquette.dev@gmail.com>
This document introduces the Linux udev script for NUT USB
drivers (usbhid-ups, bcmxcp_usb, tripplite_usb, ...).
drivers (usbhid-ups, bcmxcp_usb, tripplite_usb, ...) and IPMI driver
(nut-ipmipsu).
These are needed on Linux systems running udev (recommended
as of kernel 2.6.3, and mandatory as of 2.6.14 and higher).
This script ensure that the right privileges are set on the
usb devices files to allow the NUT driver to operate (ie
allowing the nut user to read AND write to the UPS device).
USB and IPMI devices files to allow the NUT driver to operate (ie
allowing the nut user to read AND write to the device).
Note that the old style hotplug files, available in the
scripts/hotplug directory, are not needed if your kernel supports
@ -21,21 +22,23 @@ Installation
------------
For most users, these files will be automatically installed in
/etc/udev (or /lib/udev) upon "make install", if that directory exists. You can
/etc/udev (or /lib/udev) upon "make install", if that directory exists and if
the feature (USB and / or IPMI) has been enabled at configure time. You can
specify an alternate directory with ./configure --with-udev-dir=DIR.
Manual installation
-------------------
To install them manually, copy nut-usbups.rules to /etc/udev/rules.d
(or /lib/udev/rules.d on newer systems) using the command
To install them manually, copy the rules file(s) to /etc/udev/rules.d
(or /lib/udev/rules.d on newer systems) using the command(s):
$ cp -f nut-usbups.rules /etc/udev/rules.d/52-nut-usbups.rules
$ cp -f nut-ipmipsu.rules /etc/udev/rules.d/52-nut-ipmipsu.rules
You will need to refresh the bus to avoid a reboot for these rules to be
active. You can do so using:
$ udevadm trigger --subsystem-match=usb_device
You can then plug your UPS USB cord, or unplug / replug it to
refresh the device permission, and start NUT.
For USB devices, you can then plug your UPS USB cord, or unplug / replug
it to refresh the device permission, and start NUT.

4
scripts/udev/nut-ipmipsu.rules.in Normal file
View file

@ -0,0 +1,4 @@
# This file is generated and installed by the Network UPS Tools package.
# It sets the correct device permissions for nut-ipmipsu driver.
KERNEL=="ipmi*", MODE="664", GROUP="@RUN_AS_GROUP@"

10
scripts/udev/nut-usbups.rules.in
View file

@ -66,6 +66,10 @@ ATTR{idVendor}=="051d", ATTR{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROU
ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
# PW 9140 - usbhid-ups
ATTR{idVendor}=="0592", ATTR{idProduct}=="0004", MODE="664", GROUP="@RUN_AS_GROUP@"
# Agiler UPS - blazer_usb
ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
# Belkin F6C1200-UNV - blazer_usb
ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
# Phoenixtec
# various models - bcmxcp_usb
@ -86,6 +90,8 @@ ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROU
ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
# OR2200LCDRM2U - usbhid-ups
ATTR{idVendor}=="0764", ATTR{idProduct}=="0601", MODE="664", GROUP="@RUN_AS_GROUP@"
# Sweex 1000VA - richcomm_usb
ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
# TrippLite
# e.g. OMNIVS1000, SMART550USB, ... - tripplite_usb
@ -162,9 +168,13 @@ ATTR{idVendor}=="0d9f", ATTR{idProduct}=="00a4", MODE="664", GROUP="@RUN_AS_GROU
ATTR{idVendor}=="0d9f", ATTR{idProduct}=="00a5", MODE="664", GROUP="@RUN_AS_GROUP@"
# PowerCOM BNT - Black Knight Pro - usbhid-ups
ATTR{idVendor}=="0d9f", ATTR{idProduct}=="00a6", MODE="664", GROUP="@RUN_AS_GROUP@"
# Unitek Alpha 1200Sx - blazer_usb
ATTR{idVendor}=="0f03", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
# Liebert
# Liebert PowerSure PSA UPS - usbhid-ups
ATTR{idVendor}=="10af", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
# GE EP series - blazer_usb
ATTR{idVendor}=="14f0", ATTR{idProduct}=="00c9", MODE="664", GROUP="@RUN_AS_GROUP@"
LABEL="nut-usbups_rules_end"