summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile28
-rw-r--r--scripts/ipmi_port.service3
-rwxr-xr-xscripts/ipmiutil.setup9
3 files changed, 22 insertions, 18 deletions
diff --git a/scripts/Makefile b/scripts/Makefile
index fc29dd3..77c7fe8 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.7/missing --run aclocal-1.11
-AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run tar
+ACLOCAL = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run aclocal-1.11
+AMTAR = ${SHELL} /usr/dev/ipmiutil-2.9.8/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/dev/ipmiutil-2.9.7/missing --run automake-1.11
+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
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-2.9.7/missing --run makeinfo
+MAKEINFO = ${SHELL} /usr/dev/ipmiutil-2.9.8/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 2.9.7
+PACKAGE_STRING = ipmiutil 2.9.8
PACKAGE_TARNAME = ipmiutil
-PACKAGE_VERSION = 2.9.7
+PACKAGE_VERSION = 2.9.8
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.7
-abs_builddir = /usr/dev/ipmiutil-2.9.7/scripts
-abs_srcdir = /usr/dev/ipmiutil-2.9.7/scripts
-abs_top_builddir = /usr/dev/ipmiutil-2.9.7
-abs_top_srcdir = /usr/dev/ipmiutil-2.9.7
+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
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.7/install-sh
+install_sh = ${SHELL} /usr/dev/ipmiutil-2.9.8/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff --git a/scripts/ipmi_port.service b/scripts/ipmi_port.service
index d09b37c..80ed31a 100644
--- a/scripts/ipmi_port.service
+++ b/scripts/ipmi_port.service
@@ -6,8 +6,7 @@ After=network.target
Type=forking
PIDFile=/run/ipmi_port.pid
EnvironmentFile=/usr/share/ipmiutil/ipmiutil.env
-ExecStartPre=/usr/share/ipmiutil/ipmiutil.setup
-ExecStart=/usr/sbin/ipmi_port -b
+ExecStart=/usr/share/ipmiutil/ipmiutil.setup >/dev/null && /usr/sbin/ipmi_port -b || :
[Install]
WantedBy=multi-user.target
diff --git a/scripts/ipmiutil.setup b/scripts/ipmiutil.setup
index 9087021..0330a29 100755
--- a/scripts/ipmiutil.setup
+++ b/scripts/ipmiutil.setup
@@ -37,8 +37,13 @@ isetup() {
retval=6
else
# portmap may have been replaced by portreserve
- [ -x $IPORTMAP ] || exit 6
- retval=0
+ # only need ipmi_port if portmap exists
+ if [ -x $IPORTMAP ]
+ then
+ retval=0
+ else
+ retval=6
+ fi
fi
return $retval
}