summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-05-08 23:32:28 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-05-08 23:32:28 +0200
commit55adddbc16f65732b57ab8585c47001fced91d77 (patch)
tree27e8239d48c8a6b353db356aff92ee4d225c0a0e /scripts
parentd3c90cdcdf56146af89056ed36bfcc7b4d4956c5 (diff)
Imported Upstream version 2.9.9upstream/2.9.9
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile30
-rwxr-xr-xscripts/ipmi.init.basic6
-rwxr-xr-xscripts/ipmiutil_wdt2
3 files changed, 21 insertions, 17 deletions
diff --git a/scripts/Makefile b/scripts/Makefile
index 77c7fe8..0d8a5d8 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -46,12 +46,12 @@ CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run automake-1.11
AWK = gawk
CC = gcc
CCDEPMODE = depmode=gcc3
@@ -99,13 +99,13 @@ LIB_DIR = /usr/lib64
LIPO =
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.9/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
OBJEXT = o
-OS_CFLAGS = -DLINUX -fPIC -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
+OS_CFLAGS = -DLINUX -fPIC -Wno-pointer-sign -Wno-sign-conversion -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2
OS_DRIVERS = imbapi.c ipmimv.c ipmild.c ipmidir.c
OS_LFLAGS =
OTOOL =
@@ -113,9 +113,9 @@ OTOOL64 =
PACKAGE = ipmiutil
PACKAGE_BUGREPORT =
PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 2.9.8
+PACKAGE_STRING = ipmiutil 2.9.9
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 2.9.8
+PACKAGE_VERSION = 2.9.9
PATH_SEPARATOR = :
PKG_DIR = /root/rpmbuild
RANLIB = ranlib
@@ -127,11 +127,11 @@ SHR_LINK = libipmiutil.so.1
STRIP = strip
SUBDIR_S = doc scripts lib util
SYSTEMD_DIR = /usr/share/ipmiutil
-VERSION = 2.9.8
-abs_builddir = /usr/dev/ipmiutil-2.9.8/scripts
-abs_srcdir = /usr/dev/ipmiutil-2.9.8/scripts
-abs_top_builddir = /usr/dev/ipmiutil-2.9.8
-abs_top_srcdir = /usr/dev/ipmiutil-2.9.8
+VERSION = 2.9.9
+abs_builddir = /usr/dev/ipmiutil-2.9.9/scripts
+abs_srcdir = /usr/dev/ipmiutil-2.9.9/scripts
+abs_top_builddir = /usr/dev/ipmiutil-2.9.9
+abs_top_srcdir = /usr/dev/ipmiutil-2.9.9
ac_ct_CC = gcc
ac_ct_DUMPBIN =
am__include = include
@@ -159,7 +159,7 @@ host_vendor = redhat
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.8/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.9/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff --git a/scripts/ipmi.init.basic b/scripts/ipmi.init.basic
index f12c743..bff8e55 100755
--- a/scripts/ipmi.init.basic
+++ b/scripts/ipmi.init.basic
@@ -40,7 +40,11 @@ start() {
fi
fi
modprobe ipmi_devintf
- modprobe ipmi_watchdog 2>/dev/null
+ # do not start ipmi_watchdog for Supermicro
+ dmidecode |grep -A1 'Base Board' |grep -q -i Supermicro
+ if [ $? -ne 0 ]; then
+ modprobe ipmi_watchdog 2>/dev/null
+ fi
fi
maj=$(cat /proc/devices | awk '/ipmidev/{print $1}')
diff --git a/scripts/ipmiutil_wdt b/scripts/ipmiutil_wdt
index 5f75131..b3ffcf1 100755
--- a/scripts/ipmiutil_wdt
+++ b/scripts/ipmiutil_wdt
@@ -61,7 +61,7 @@ start() {
# RETVAL=$?
# restart the watchdog every 60 seconds via /etc/cron.d
cat - <<%%% >$wdtcron
-* * * * * root $prog -r
+* * * * * root $prog -r >/dev/null
%%%
# make crond re-read the /etc/cron.d
$crond_sh restart >>$wdtlog