--- radvd-1.0/redhat/radvd.init.initscript	2007-08-03 11:50:05.000000000 +0200
+++ radvd-1.0/redhat/radvd.init	2007-08-03 13:37:33.000000000 +0200
@@ -2,7 +2,10 @@
 #
 # $Id: radvd.init,v 1.2 2002/01/08 09:00:50 psavola Exp $
 #
+### BEGIN INIT INFO
+# provides: radvd
 # chkconfig: - 54 46
+# short-Description: router advertisement daemon for IPv6
 # description:	radvd is the router advertisement daemon for IPv6.  It \
 #		listens to router solicitations and sends router \
 #		advertisements as described in "Neighbor Discovery for IP \
@@ -15,6 +18,7 @@
 # pidfile: /var/run/radvd.pid
 # config: /etc/radvd.conf
 # config: /etc/sysconfig/radvd
+### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -22,31 +26,37 @@
 # Get config.
 . /etc/sysconfig/network
 
-# Check that networking is up.
-[ x${NETWORKING_IPV6} = "xyes" ] || exit 0
-
 [ -f /etc/sysconfig/radvd ] && . /etc/sysconfig/radvd
 
-[ -f /usr/sbin/radvd ] || exit 0
+if [ $1 == 'status' ]; then
+	[ -f /usr/sbin/radvd ] && exit 4
+else 
+	[ -f /usr/sbin/radvd ] && exit 1
+fi
 
 RETVAL=0
-prog="radvd"
+PROG="radvd"
+LOCKFILE=/var/lock/subsys/radvd
 
 # See how we were called.
 case "$1" in
   start)
-	echo -n $"Starting $prog: "
+
+	# Check that networking is up.	
+	[ x${NETWORKING_IPV6} = "xyes" ] || exit 1
+
+	echo -n $"Starting $PROG: "
 	daemon radvd $OPTIONS
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/radvd
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	;;
   stop)
-	echo -n $"Stopping $prog: "
+	echo -n $"Stopping $PROG: "
 	killproc radvd
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/radvd
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
 	;;
   status)
 	status radvd
@@ -58,13 +68,13 @@
 	RETVAL=$?
 	;;
   reload)
-	echo -n $"Reloading $prog: "
+	echo -n $"Reloading $PROG: "
 	killproc radvd -HUP
 	RETVAL=$?	
 	echo
 	;;
   condrestart)
-        if [ -f /var/lock/subsys/radvd ]; then
+        if [ -f $LOCKFILE ]; then
 		$0 stop
 		$0 start
 		RETVAL=$?
@@ -72,7 +82,7 @@
         ;;  
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
-	exit 1
+	exit 2
 esac
 
 exit $RETVAL