bircoph 15/02/11 04:45:41
Modified: opensm.init.d
Added: sldd.conf.d sldd.init.d opensm-3.3.17-norpm.patch
opensm.conf.d opensm-3.3.17-sldd.patch
Log:
Fix bugs 387623, 531980, 533676.
Signed-off-by: Andrew Savchenko <[email protected]>
(Portage version: 2.2.15/cvs/Linux i686, signed Manifest commit with key
565953B95372756C)
Revision Changes Path
1.3 sys-infiniband/opensm/files/opensm.init.d
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d?r1=1.2&r2=1.3
Index: opensm.init.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- opensm.init.d 18 Apr 2012 16:45:30 -0000 1.2
+++ opensm.init.d 11 Feb 2015 04:45:41 -0000 1.3
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d,v
1.2 2012/04/18 16:45:30 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d,v
1.3 2015/02/11 04:45:41 bircoph Exp $
depend() {
need openib
@@ -12,7 +12,7 @@
start() {
ebegin "Starting OpenSM Infiniband Subnet Manager"
- start-stop-daemon --start --background --exec $prog -- $OPTIONS
+ start-stop-daemon --start --background --exec $prog -- $OSM_OPTIONS
eend $?
}
1.1 sys-infiniband/opensm/files/sldd.conf.d
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/sldd.conf.d?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/sldd.conf.d?rev=1.1&content-type=text/plain
Index: sldd.conf.d
===================================================================
# Tho following variables will used for sldd.sh
#
# You must setup this for sldd to work
OSM_HOSTS=""
### Optional variables (defaults are commented out)
# Debug level
#SLDD_DEBUG="0"
# OpenSM cache files
#CACHE_FILE="/var/cache/opensm/guid2lid:/var/cache/opensm/guid2mkey:/var/cache/opensm/neighbors"
# System calls
#PING="ping -w 1 -c 1"
#RCP="/usr/bin/scp"
#SSH="/usr/bin/ssh"
#IFCONFIG="/bin/ifconfig -a"
# Delay between hosts scan
#RESCAN_TIME="60"
1.1 sys-infiniband/opensm/files/sldd.init.d
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/sldd.init.d?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/sldd.init.d?rev=1.1&content-type=text/plain
Index: sldd.init.d
===================================================================
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/sldd.init.d,v
1.1 2015/02/11 04:45:41 bircoph Exp $
depend() {
need opensm
after net # ip net seems to be needed to perform management.
}
prog=/usr/sbin/sldd.sh
pidfile=/var/run/sldd.pid
start() {
ebegin "Starting Semi-static LID OpenSM Distribution Manager"
start-stop-daemon --start --background --pidfile "${pidfile}" \
--make-pidfile --wait 500 --exec $prog
eend $?
}
stop() {
ebegin "Stopping OpenSM Infiniband Subnet Manager"
start-stop-daemon --stop --pidfile "${pidfile}"
eend $?
}
1.1 sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch?rev=1.1&content-type=text/plain
Index: opensm-3.3.17-norpm.patch
===================================================================
--- opensm-3.3.17/configure.in.orig 2014-01-30 23:13:35.000000000 +0400
+++ opensm-3.3.17/configure.in 2014-12-27 02:48:11.264876067 +0300
@@ -17,11 +17,7 @@
[name of the RDMA service: "rdma" when using
/etc/init.d/rdma to start RDMA services; "openibd" when using
/etc/init.d/openibd to start RDMA services [default=${default_rdma_service}]]))
AC_SUBST(RDMA_SERVICE, ${with_rdma_service:-${default_rdma_service}})
-if { rpm -q sles-release || rpm -q openSUSE-release; } >/dev/null 2>&1; then
- default_stop="0 1 4 6"
-else
- default_stop="0 1 6"
-fi
+default_stop="0 1 6"
default_start="null"
@@ -282,4 +278,4 @@
AC_CONFIG_FILES([man/opensm.8 man/torus-2QoS.8 man/torus-2QoS.conf.5
scripts/opensm.init scripts/redhat-opensm.init scripts/sldd.sh])
dnl Create the following Makefiles
-AC_OUTPUT([include/opensm/osm_version.h Makefile include/Makefile
complib/Makefile libvendor/Makefile opensm/Makefile osmeventplugin/Makefile
osmtest/Makefile opensm.spec])
+AC_OUTPUT([include/opensm/osm_version.h Makefile include/Makefile
complib/Makefile libvendor/Makefile opensm/Makefile osmeventplugin/Makefile
osmtest/Makefile])
--- opensm-3.3.17/Makefile.am.orig 2013-02-07 11:46:28.000000000 +0400
+++ opensm-3.3.17/Makefile.am 2014-12-27 02:48:45.133654187 +0300
@@ -19,7 +19,7 @@
doc/partition-config.txt doc/opensm-sriov.txt \
doc/opensm_release_notes-3.3.txt
-EXTRA_DIST = autogen.sh opensm.spec $(various_scripts) $(man_MANS) $(docs)
+EXTRA_DIST = autogen.sh $(various_scripts) $(man_MANS) $(docs)
dist-hook: $(EXTRA_DIST)
if [ -x $(top_srcdir)/gen_chlog.sh ] ; then \
1.1 sys-infiniband/opensm/files/opensm.conf.d
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.conf.d?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.conf.d?rev=1.1&content-type=text/plain
Index: opensm.conf.d
===================================================================
# Provide OpenSM options here.
# See man opensm for details
OSM_OPTIONS=""
1.1 sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch?rev=1.1&content-type=text/plain
Index: opensm-3.3.17-sldd.patch
===================================================================
--- opensm-3.3.17/scripts/sldd.sh.in.orig 2013-02-07 11:46:29.000000000
+0400
+++ opensm-3.3.17/scripts/sldd.sh.in 2014-12-27 04:47:24.488636743 +0300
@@ -42,7 +42,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-CONFIG=@sysconfdir@/sysconfig/opensm
+CONFIG=@sysconfdir@/conf.d/sldd
if [ -f $CONFIG ]; then
. $CONFIG
fi
@@ -57,7 +57,7 @@
RCP=${RCP:-/usr/bin/scp}
RSH=${RSH:-/usr/bin/ssh}
-IFCONFIG=${IFCONFIG:-'/sbin/ifconfig -a'}
+IFCONFIG=${IFCONFIG:-'/bin/ifconfig -a'}
declare -i SLDD_DEBUG
RESCAN_TIME=${RESCAN_TIME:-60}
