Refresh of suse2

diff --git a/ibacm.init.in b/ibacm.init.in
index db7e870d998825cf246e7b4ab6646572b42fc8a3..d58abbfa42f7e9fef89e999c378b739b47d93940 100644 (file)
--- a/ibacm.init.in
+++ b/ibacm.init.in
@@ -27,30 +27,32 @@ daemon() { /sbin/daemon   ${1+"$@"}; }
 if [ -s /etc/init.d/functions ]; then
        # RHEL / CentOS / SL / Fedora
        . /etc/init.d/functions
+        _daemon()  { daemon ${1+"$@"}; }
+        _success() { success; echo; }
+        _failure() { failure; echo; }
 elif [ -s /lib/lsb/init-functions ]; then
        # SLES / OpenSuSE / Debian
        . /lib/lsb/init-functions
-       daemon()  { /sbin/start_daemon ${1+"$@"}; }
-       success() { log_success_msg; }
-       failure() { log_failure_msg; }
+       _daemon()  { /sbin/start_daemon ${1+"$@"}; }
+       _success() { log_success_msg; }
+       _failure() { log_failure_msg; }
 elif [ -s /etc/rc.status ]; then
        # Older SuSE
        . /etc/rc.status
-       daemon()  { /sbin/start_daemon ${1+"$@"}; }
-       success() { rc_status -v; }
-       failure() { rc_status -v; }
+       _daemon()  { /sbin/start_daemon ${1+"$@"}; }
+       _success() { rc_status -v; }
+       _failure() { rc_status -v; }
 fi     
 
 start()
 {
     echo -n "Starting ibacm daemon:"
-    daemon @prefix@/sbin/ibacm
+    _daemon @prefix@/sbin/ibacm
     if [[ $RETVAL -eq 0 ]]; then
-        success
+        _success
     else
-        failure
+        _failure
     fi
-    echo
 }
 
 stop()
@@ -58,12 +60,11 @@ stop()
     echo -n "Stopping ibacm daemon:"
     killproc -p $pidfile ibacm
     if [[ $RETVAL -eq 0 ]]; then
-        success
+        _success
     else
-        failure
+        _failure
     fi
     rm -f $subsys
-    echo
 }
 
 status()
@@ -80,11 +81,10 @@ status()
         RETVAL=0
     fi
     if [[ $RETVAL -eq 0 ]]; then
-        success
+        _success
     else
-        failure
+        _failure
     fi
-    echo
 }
 
 restart ()