SOURCES: avahi-daemon - merge force-reload to reload

[glen]

Author: glen                         Date: Fri Dec  8 11:59:34 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merge force-reload to reload

---- Files affected:
SOURCES:
   avahi-daemon (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/avahi-daemon
diff -u SOURCES/avahi-daemon:1.5 SOURCES/avahi-daemon:1.6
--- SOURCES/avahi-daemon:1.5	Fri Dec  8 12:01:59 2006
+++ SOURCES/avahi-daemon	Fri Dec  8 12:59:29 2006
@@ -57,20 +57,16 @@
 	$0 start
 	exit $?
 	;;
-  reload)
+  reload|force-reload)
 	if [ -f /var/lock/subsys/avahi-daemon ]; then
 		msg_reloading avahi-daemon
 		avahi-daemon -r
 		RETVAL=$?
 	else
-		msg_not_running avahi-daemon >&2
+		msg_not_running avahi-daemon
 		RETVAL=7
 	fi
 	;;
-  force-reload)
-	$0 reload
-	exit $?
-	;;
   status)
 	status avahi-daemon
 	RETVAL=$?
@@ -81,6 +77,3 @@
 esac
 
 exit $RETVAL
-
-# This must be last line !
-# vi:syntax=sh:tw=78:ts=8:sw=4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/avahi-daemon?r1=1.5&r2=1.6&f=u