X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fmpt-status.git;a=blobdiff_plain;f=mpt-status.init;fp=mpt-status.init;h=b5fa7caf5984c0b11c793fdcec6aed3d2b40f199;hp=af69e06b2163d0eee5b797bcdede2c806542450d;hb=969c3166c876b2a9cdcf30fec8a2921633d372da;hpb=92a17ae60f4fb696d6094e0038c9918582d537ff

diff --git a/mpt-status.init b/mpt-status.init
index af69e06..b5fa7ca 100644
--- a/mpt-status.init
+++ b/mpt-status.init
@@ -41,10 +41,9 @@ test -x /usr/sbin/mpt-status || exit 0
 
 # Source function library.
 . /etc/rc.d/init.d/functions
-. /lib/lsb/init-functions
 
 if [ $RUN_DAEMON = "no" ] ; then
-	log_failure_msg $"mpt-statusd is disabled in /etc/default/mpt-statusd, not starting."
+        echo "mpt-statusd is disabled in /etc/default/mpt-statusd, not starting." && failure
 	exit 0
 fi
 
@@ -53,7 +52,7 @@ fi
 modprobe mptctl || true
 
 if ! [ -e "/proc/mpt/version" ] ; then
-  	log_failure_msg "The mptctl module is missing."
+  	echo "The mptctl module is missing." && failure
 	exit 0
 fi
 
@@ -137,7 +136,7 @@ check_daemon() {
 d_start() {
     [ -f $PIDFILE ] && PID="`cat $PIDFILE`"
     if [ "$PID" ] ; then
-        log_warning_msg "Daemon already running. Refusing to start another"
+        echo "Daemon already running. Refusing to start another" && warning
         return 0
     elif check_daemon ; then
 	# Use daemonize to turn it into a daemon and start it with daemon().
@@ -146,7 +145,7 @@ d_start() {
 	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	return $RETVAL
     else
-        log_warning_msg "Daemon is already running. Refusing to start another"
+        echo "Daemon is already running. Refusing to start another" && warning
         return 0
     fi
 }
@@ -163,11 +162,11 @@ d_stop() {
 		    rm -f $PIDFILE $LOCKFILE
 		    return 0
 		else
-		    log_failure_msg "$NAME failed to stop"
+		    echo "$NAME failed to stop" && failure
 		    return 1
 		fi
         else
-                log_warning_msg "$NAME is already stopped."
+                echo "$NAME is already stopped." && warning
                 return 0
         fi
 }
@@ -179,7 +178,7 @@ d_stop_by_restart() {
                 killproc -p $PIDFILE $SCRIPTNAME > /dev/null 2>&1
                 rm -f $PIDFILE $LOCKFILE
         else
-                log_warning_msg "Daemon is already stopped."
+                echo "Daemon is already stopped." && warning
         fi
 }