--- ifplugd	2005-09-02 15:03:14.000000000 -0400
+++ ifplugd.new	2005-09-02 15:21:11.000000000 -0400
@@ -48,8 +48,10 @@
 IFPLUGD=/usr/sbin/ifplugd
 test -x $IFPLUGD || exit 0
 
+. /lib/lsb/init-functions
+
 if [ `id -u` != "0" ] && [ "$1" = "start" -o "$1" = "stop" ] ; then
-  echo "You must be root to start, stop or restart ifplugd."
+  log_failure_msg "You must be root to start, stop or restart ifplugd."
   exit 1
 fi
 
@@ -64,44 +66,48 @@
 
 case "$VERB" in
     start)
-        echo -n "Starting Network Interface Plugging Daemon:"
+        log_begin_msg "Starting Network Interface Plugging Daemon..."
+	STATUS=0
         for IF in $INTERFACES ; do
             IF1=$(echo $IF | sed "s/-/_/")
             A=$(eval echo \$\{ARGS_${IF1}\})
             [ -z "$A" ] && A="$ARGS"
             $IFPLUGD -i $IF $A
-            echo -n " $IF"
+	    test $? = 0 || STATUS=1
         done
-        echo "."
+        log_end_msg $STATUS
         ;;
     stop)
-        echo -n "Stopping Network Interface Plugging Daemon:"
+        log_begin_msg "Stopping Network Interface Plugging Daemon..."
+	STATUS=0
         for IF in $INTERFACES ; do 
             $IFPLUGD -k --wait-on-kill -i $IF
-            echo -n " $IF"
+	    test $? = 0 || STATUS=1
         done
-        echo "."
+        log_end_msg $STATUS
         ;;
     status)
         for IF in $INTERFACES ; do
-            $IFPLUGD -c -i $IF
+            log_success_msg "`$IFPLUGD -c -i $IF`"
         done
         ;;
     suspend)
-        echo -n "Suspending Network Interface Plugging Daemon:"
+        log_begin_msg "Suspending Network Interface Plugging Daemon..."
+	STATUS=0
         for IF in $INTERFACES ; do
             $IFPLUGD -S -i $IF
-            echo -n " $IF"
+            test $? = 0 || STATUS=1
         done
-        echo "."    
+        log_end_msg $STATUS
         ;;
     resume)
-        echo -n "Resuming Network Interface Plugging Daemon:"
+        log_begin_msg "Resuming Network Interface Plugging Daemon..."
+	STATUS=0
         for IF in $INTERFACES ; do
             $IFPLUGD -R -i $IF
-            echo -n " $IF"
+            test $? = 0 || STATUS=1
         done
-        echo "."    
+        log_end_msg $STATUS
         ;;
     force-reload|restart)
         $0 stop $INTERFACES
@@ -109,8 +115,8 @@
         $0 start $INTERFACES
         ;;
     *)
-        echo "Usage: $0 {start|stop|restart|force-reload|status|suspend|resume}"
-        exit 1
+        log_success_msg "Usage: $0 start|stop|restart|force-reload|status|suspend|resume"
+        ;;
 esac
 
 exit 0