Update upstream source from tag 'upstream/3.1.1'

Update to upstream version '3.1.1'
with Debian dir 8a00ab19696666598c7c15367cc89d75ebcf338e

2 files changed, 24 insertions, 16 deletions

diff --git a/scripts/Makefile b/scripts/Makefile
index a2b013c..36c3148 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-3.1.0/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run tar
 AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run automake-1.11
+AUTOCONF = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run autoconf
+AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run autoheader
+AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run automake-1.11
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -99,7 +99,7 @@ LIB_DIR = /usr/lib64
 LIPO = 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.0/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-3.1.1/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NM = /usr/bin/nm -B
 NMEDIT = 
@@ -113,9 +113,9 @@ OTOOL64 =
 PACKAGE = ipmiutil
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = ipmiutil
-PACKAGE_STRING = ipmiutil 3.1.0
+PACKAGE_STRING = ipmiutil 3.1.1
 PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 3.1.0
+PACKAGE_VERSION = 3.1.1
 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 = 3.1.0
-abs_builddir = /usr/dev/ipmiutil-3.1.0/scripts
-abs_srcdir = /usr/dev/ipmiutil-3.1.0/scripts
-abs_top_builddir = /usr/dev/ipmiutil-3.1.0
-abs_top_srcdir = /usr/dev/ipmiutil-3.1.0
+VERSION = 3.1.1
+abs_builddir = /usr/dev/ipmiutil-3.1.1/scripts
+abs_srcdir = /usr/dev/ipmiutil-3.1.1/scripts
+abs_top_builddir = /usr/dev/ipmiutil-3.1.1
+abs_top_srcdir = /usr/dev/ipmiutil-3.1.1
 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-3.1.0/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-3.1.1/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 bff8e55..3321183 100755
--- a/scripts/ipmi.init.basic
+++ b/scripts/ipmi.init.basic
@@ -21,6 +21,8 @@
 #=====
 #
 rv=0
+kver=`uname -r`
+moddir=/lib/modules/$kver/kernel/drivers
 
 start() {
   lsmod |grep ipmi_dev >/dev/null
@@ -29,14 +31,14 @@ start() {
      # load the ipmi modules, if not already loaded or builtin
      cat /proc/kallsyms |grep ipmi_init_msghandler >/dev/null 2>&1
      if [ $? -ne 0 ]; then
-	modprobe ipmi_msghandler
+        modprobe ipmi_msghandler
      fi
      cat /proc/kallsyms |grep init_ipmi_si >/dev/null 2>&1
      if [ $? -ne 0 ]; then
         modprobe ipmi_si  
         rv=$?
         if [ $rv -ne 0 ]; then
-	   modprobe ipmi_si_drv # try old module name
+           modprobe ipmi_si_drv # try old module name
         fi
      fi
      modprobe ipmi_devintf
@@ -45,6 +47,10 @@ start() {
      if [ $? -ne 0 ]; then
         modprobe ipmi_watchdog 2>/dev/null
      fi
+	 if [ -f $moddir/acpi/acpi_ipmi.ko ]; then
+        modprobe acpi_ipmi  
+        modprobe power_meter  
+     fi
   fi
 
   maj=$(cat /proc/devices | awk '/ipmidev/{print $1}')
@@ -58,6 +64,8 @@ stop() {
   lsmod |grep ipmi_msghandler >/dev/null
   if [ $? -eq 0 ]; then
      echo "Stopping OpenIPMI driver ..."
+     rmmod power_meter  2>/dev/null
+     rmmod acpi_ipmi    2>/dev/null
      rmmod ipmi_poweroff 2>/dev/null
      rmmod ipmi_watchdog 2>/dev/null
      rmmod ipmi_devintf  2>/dev/null