SOURCES: avahi-dnsconfd, avahi-daemon - use provied functions to p...

[freetz]

Author: freetz                       Date: Sat Mar  4 21:10:18 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use provied functions to properly stop and reload service

---- Files affected:
SOURCES:
   avahi-dnsconfd (1.3 -> 1.4) , avahi-daemon (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/avahi-dnsconfd
diff -u SOURCES/avahi-dnsconfd:1.3 SOURCES/avahi-dnsconfd:1.4
--- SOURCES/avahi-dnsconfd:1.3	Mon Jan 23 00:11:00 2006
+++ SOURCES/avahi-dnsconfd	Sat Mar  4 22:10:13 2006
@@ -2,7 +2,7 @@
 #
 # avahi-dnsconfd:	Starts the Avahi dns configuration daemon
 #
-# chkconfig:		345 34 66
+# chkconfig:		345 35 65
 #
 # description:	avahi-dnsconfd connects to a running avahi-daemon and runs the script \
 #		/etc/avahi/dnsconf.action for each unicast DNS server that is announced \
@@ -45,8 +45,9 @@
 	if [ -f /var/lock/subsys/avahi-dnsconfd ]; then
 		# Stop daemons.
 		msg_stopping avahi-dnsconfd
-		killproc avahi-dnsconfd
+		avahi-dnsconfd -k
 		rm -f /var/lock/subsys/avahi-dnsconfd
+		ok
 	else
 		msg_not_running avahi-dnsconfd
 	fi
@@ -59,7 +60,7 @@
   reload)
 	if [ -f /var/lock/subsys/avahi-dnsconfd ]; then
 		msg_reloading avahi-dnsconfd
-		killproc avahi-dnsconfd -HUP
+		avahi-dnsconfd -r
 		RETVAL=$?
 	else
 		msg_not_running avahi-dnsconfd >&2

================================================================
Index: SOURCES/avahi-daemon
diff -u SOURCES/avahi-daemon:1.3 SOURCES/avahi-daemon:1.4
--- SOURCES/avahi-daemon:1.3	Mon Jan 23 00:11:00 2006
+++ SOURCES/avahi-daemon	Sat Mar  4 22:10:13 2006
@@ -44,8 +44,9 @@
 	if [ -f /var/lock/subsys/avahi-daemon ]; then
 		# Stop daemons.
 		msg_stopping avahi-daemon
-		killproc avahi-daemon
+		avahi-daemon -k
 		rm -f /var/lock/subsys/avahi-daemon
+		ok
 	else
 		msg_not_running avahi-daemon
 	fi
@@ -58,7 +59,7 @@
   reload)
 	if [ -f /var/lock/subsys/avahi-daemon ]; then
 		msg_reloading avahi-daemon
-		killproc avahi-daemon -HUP
+		avahi-daemon -r
 		RETVAL=$?
 	else
 		msg_not_running avahi-daemon >&2
================================================================

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