Imported Upstream version 2.6.4

This commit is contained in:
Arnaud Quette 2012-06-01 15:55:19 +02:00
parent fad6ced6f6
commit fefe62b2bd
257 changed files with 6020 additions and 1394 deletions

View file

@ -1,11 +1,6 @@
EXTRA_DIST = README
if HAVE_SYSTEMD
%.service: %.service.in
sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
nutshutdown: nutshutdown.in
sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
systemdsystemunit_DATA = \
nut-driver.service \

View file

@ -40,7 +40,10 @@ target_triplet = @target@
@HAVE_SYSTEMD_FALSE@ nut-server.service.in nutshutdown.in
subdir = scripts/systemd
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/nut-driver.service.in \
$(srcdir)/nut-monitor.service.in \
$(srcdir)/nut-server.service.in $(srcdir)/nutshutdown.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 \
@ -68,7 +71,8 @@ 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 =
CONFIG_CLEAN_FILES = nut-driver.service nut-monitor.service \
nut-server.service nutshutdown
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@ -178,6 +182,7 @@ MKDIR_P = @MKDIR_P@
NETLIBS = @NETLIBS@
NM = @NM@
NMEDIT = @NMEDIT@
NUT_NETVERSION = @NUT_NETVERSION@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_NAME = @OS_NAME@
@ -191,6 +196,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIDPATH = @PIDPATH@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -198,6 +204,7 @@ PORT = @PORT@
RANLIB = @RANLIB@
RUN_AS_GROUP = @RUN_AS_GROUP@
RUN_AS_USER = @RUN_AS_USER@
SBINDIR = @SBINDIR@
SED = @SED@
SERLIBS = @SERLIBS@
SET_MAKE = @SET_MAKE@
@ -311,6 +318,14 @@ $(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-driver.service: $(top_builddir)/config.status $(srcdir)/nut-driver.service.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
nut-monitor.service: $(top_builddir)/config.status $(srcdir)/nut-monitor.service.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
nut-server.service: $(top_builddir)/config.status $(srcdir)/nut-server.service.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
nutshutdown: $(top_builddir)/config.status $(srcdir)/nutshutdown.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-systemdsystemshutdownSCRIPTS: $(systemdsystemshutdown_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(systemdsystemshutdowndir)" || $(MKDIR_P) "$(DESTDIR)$(systemdsystemshutdowndir)"
@ -526,12 +541,6 @@ uninstall-am: uninstall-systemdsystemshutdownSCRIPTS \
uninstall-systemdsystemunitDATA
@HAVE_SYSTEMD_TRUE@%.service: %.service.in
@HAVE_SYSTEMD_TRUE@ sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
@HAVE_SYSTEMD_TRUE@nutshutdown: nutshutdown.in
@HAVE_SYSTEMD_TRUE@ sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View file

@ -4,7 +4,7 @@ After=local-fs.target network.target
StopWhenUnneeded=yes
[Service]
ExecStart=/sbin/upsdrvctl start
ExecStop=/sbin/upsdrvctl stop
ExecStart=@SBINDIR@/upsdrvctl start
ExecStop=@SBINDIR@/upsdrvctl stop
Type=forking

View file

@ -3,8 +3,8 @@ Description=Network UPS Tools - power device monitor and shutdown controller
After=local-fs.target network.target nut-server.service
[Service]
ExecStart=/usr/sbin/upsmon
PIDFile=/var/run/nut/upsmon.pid
ExecStart=@SBINDIR@/upsmon
PIDFile=@PIDPATH@/upsmon.pid
Type=forking
[Install]

View file

@ -5,7 +5,7 @@ Requires=nut-driver.service
Before=nut-monitor.service
[Service]
ExecStart=/usr/sbin/upsd
ExecStart=@SBINDIR@/upsd
Type=forking
[Install]

View file

@ -1,2 +1,2 @@
#!/bin/sh
upsmon -K >/dev/null 2>&1 && upsdrvctl shutdown
@SBINDIR@/upsmon -K >/dev/null 2>&1 && @SBINDIR@/upsdrvctl shutdown