- rewrited with new functions

Changed files:
    lpd.init -> 1.6

diff --git a/lpd.init b/lpd.init
index d9746a7d1e573e847f3bac5722242cb0f6ec9224..ca26c27dff35e71664bce6a8aa98ca6890f4cc9d 100644 (file)
--- a/lpd.init
+++ b/lpd.init
@@ -22,42 +22,50 @@
 [ -f /etc/sysconfig/lpd ] && . /etc/sysconfig/lpd
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       echo "WARNING: Networking is down. Lpd can't be runed."
-       exit 1
+if is_no "${NETWORKING}"; then
+        msg_Network_Down Lpd
+        exit 1
 fi
-
+                       
 # Sanity check
-[ -f /etc/printcap ] || exit 0
-
+[ -f /etc/printcap ] || exit 1
 
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/lpd ]; then
-               show Starting lpd
-               daemon lpd
-       else
-               echo "lpd already is running"
-       fi
-        touch /var/lock/subsys/lpd
+        if [ ! -f /var/lock/subsys/lpd ]; then
+                msg_starting Lpd
+                daemon lpd
+                RETVAL=$?
+                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lpd
+        else
+                msg_Already_Running Lpd
+                exit 1
+        fi
         ;;
   stop)
-        show "Shutting down lpd"
-       killproc lpd
-        rm -f /var/lock/subsys/lpd
+        # Stop daemons.
+        if [ -f /var/lock/subsys/lpd ]; then
+                msg_stopping Lpd
+                killproc lpd
+                rm -f /var/lock/subsys/lpd >/dev/null 2>&1
+        else
+                msg_Not_Running Lpd
+                exit 1
+        fi
         ;;
   status)
        status lpd
+       exit $?
        ;;
-  restart|reload)
+  restart)
        $0 stop
        $0 start
        ;;
   *)
-        echo "Usage: $0 {start|stop|status|restart|reload}"
+       msg_Usage "$0 {start|stop|status|restart}"
         exit 1
 esac
 
-exit 0
+exit $RETVAL