Imported Upstream version 2.7.2
This commit is contained in:
parent
0121794af9
commit
a356b56d11
263 changed files with 6039 additions and 8151 deletions
|
|
@ -65,7 +65,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.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_libltdl.m4 \
|
||||
$(top_srcdir)/m4/nut_check_libneon.m4 \
|
||||
$(top_srcdir)/m4/nut_check_libnetsnmp.m4 \
|
||||
|
|
@ -75,10 +74,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
|
|||
$(top_srcdir)/m4/nut_check_libusb.m4 \
|
||||
$(top_srcdir)/m4/nut_check_libwrap.m4 \
|
||||
$(top_srcdir)/m4/nut_check_os.m4 \
|
||||
$(top_srcdir)/m4/nut_config_libhal.m4 \
|
||||
$(top_srcdir)/m4/nut_report_feature.m4 \
|
||||
$(top_srcdir)/m4/nut_type_socklen_t.m4 \
|
||||
$(top_srcdir)/configure.in
|
||||
$(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
|
|
@ -135,10 +133,6 @@ EGREP = @EGREP@
|
|||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GREP = @GREP@
|
||||
HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
|
||||
HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
|
||||
HAL_FDI_PATH = @HAL_FDI_PATH@
|
||||
HAL_USER = @HAL_USER@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
@ -150,8 +144,6 @@ 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@
|
||||
LIBLTDL_CFLAGS = @LIBLTDL_CFLAGS@
|
||||
|
|
@ -237,6 +229,7 @@ builddir = @builddir@
|
|||
cgiexecdir = @cgiexecdir@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
devddir = @devddir@
|
||||
docdir = @docdir@
|
||||
driverexecdir = @driverexecdir@
|
||||
dvidir = @dvidir@
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ fi
|
|||
ups_stop () {
|
||||
pkill -n upsmon
|
||||
pkill -n upsd
|
||||
${NUT_DIR}/bin/upsdrvctl stop > /dev/null 2>&1
|
||||
${NUT_DIR}/sbin/upsdrvctl stop > /dev/null 2>&1
|
||||
}
|
||||
|
||||
ups_start () {
|
||||
|
|
@ -22,7 +22,7 @@ ups_start () {
|
|||
fi
|
||||
|
||||
if [ ! "$MODE" = "netclient" ];then
|
||||
$NUT_DIR/bin/upsdrvctl start #> /dev/null 2>&1
|
||||
$NUT_DIR/sbin/upsdrvctl start #> /dev/null 2>&1
|
||||
$NUT_DIR/sbin/upsd #> /dev/null 2>&1
|
||||
fi
|
||||
$NUT_DIR/sbin/upsmon #> /dev/null 2>&1
|
||||
|
|
@ -49,7 +49,7 @@ case $1 in
|
|||
$NUT_DIR/sbin/upsmon -K >/dev/null 2>&1
|
||||
if [ $? = 0 ]; then
|
||||
echo "Shutting down the UPS ..."
|
||||
#$NUT_DIR/bin/upsdrvctl shutdown
|
||||
#$NUT_DIR/sbin/upsdrvctl shutdown
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ ln -s /etc/init.d/nut /etc/rc3.d/K100nut > /dev/null 2>&1
|
|||
# Start nut services
|
||||
|
||||
#echo "Starting nut services"
|
||||
#$NUT_DIR/bin/upsdrvctl start #> /dev/null 2>&1
|
||||
#$NUT_DIR/sbin/upsdrvctl start #> /dev/null 2>&1
|
||||
#$NUT_DIR/sbin/upsd #> /dev/null 2>&1
|
||||
#$NUT_DIR/sbin/upsmon #> /dev/null 2>&1
|
||||
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@
|
|||
|
||||
NUT_DIR="@prefix@"
|
||||
|
||||
#$NUT_DIR/bin/upsdrvctl stop
|
||||
#$NUT_DIR/sbin/upsdrvctl stop
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue