Version: 1
-Previous: 9200bf7270b7a2c1d41c6a8c1defc0e32ae4e13b
-Head: 9b5993fbd79bc35d4d5cb276f6e7b01da93dc67a
+Previous: a7b973146e7d0ccc96e078e8ab929251a1062ac5
+Head: 61e3b01cba1303bccd939e57150b584c60a57e8b
Applied:
suse2: 9b5993fbd79bc35d4d5cb276f6e7b01da93dc67a
+ refresh-temp: 61e3b01cba1303bccd939e57150b584c60a57e8b
Unapplied:
suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
--- /dev/null
+Bottom: fb9f097f0cf8ff4c09c0ccb617f41f4b916b1573
+Top: 69a99b919a2a28dade2e890b9a952846dee8f2de
+Author: Sean Hefty <sean.hefty@intel.com>
+Date: 2014-02-04 17:10:43 -0800
+
+Refresh of suse2
+
+---
+
+diff --git a/ibacm.init.in b/ibacm.init.in
+index 2f340a5..766d3e9 100644
+--- a/ibacm.init.in
++++ b/ibacm.init.in
+@@ -22,20 +22,30 @@
+ pidfile=/var/run/ibacm.pid
+ subsys=/var/lock/subsys/ibacm
+
+-if [-f /etc/init.d/functions]; then
++daemon() { /sbin/daemon ${1+"$@"}; }
++xstatus() { /sbin/status ${1+"$@"}; }
++
++if [-s /etc/init.d/functions]; then
+ # RHEL / CentOS / SL / Fedora
+ . /etc/init.d/functions
++
+ rc_status() { :; }
+ rc_exit() { exit $RETVAL; }
+-elif [-f /lib/lsb/init-functions]; then
++elif [-s /lib/lsb/init-functions]; then
+ # SLES / OpenSuSE / Debian
+ . /lib/lsb/init-functions
++ daemon() { /sbin/start_daemon ${1+"$@"}; }
++ xstatus() { /sbin/checkproc ${1+"$@"}; }
++
+ rc_exit() { exit $RETVAL; }
+ success() { log_success_msg; }
+ failure() { log_failure_msg; }
+-elif [-f /etc/rc.status]; then
++elif [-s /etc/rc.status]; then
+ # Older SuSE
+ . /etc/rc.status
++ daemon() { /sbin/start_daemon ${1+"$@"}; }
++ xstatus() { /sbin/checkproc ${1+"$@"}; }
++
+ success() { rc_status -v; }
+ failure() { rc_status -v; }
+ fi
+@@ -44,7 +54,7 @@ start()
+ {
+ echo -n "Starting ibacm daemon:"
+ daemon @prefix@/sbin/ibacm
+- if [$RETVAL -eq 0]; then
++ if [[$RETVAL -eq 0]]; then
+ success
+ else
+ failure
+@@ -56,7 +66,7 @@ stop()
+ {
+ echo -n "Stopping ibacm daemon:"
+ killproc -p $pidfile ibacm
+- if [$RETVAL -eq 0]; then
++ if [[$RETVAL -eq 0]]; then
+ success
+ else
+ failure
+@@ -67,15 +77,12 @@ stop()
+
+ status()
+ {
+- if [ ! -f $subsys -a ! -f $pidfile ]; then
+- return 3
+- fi
+- if [ -f $pidfile ]; then
+- checkpid `cat $pidfile`
+- return $?
+- fi
+- if [ -f $subsys ]; then
+- return 2
++ echo -n "Checking for ibacm service "
++ xstatus @prefix@/sbin/ibacm
++ if [[$RETVAL -eq 0]]; then
++ success
++ else
++ failure
+ fi
+ }