From f386380ed985f6a720195e9a7075e3fe912ea9b2 Mon Sep 17 00:00:00 2001
From: Sebastien Estienne <sebastien.estienne@gmail.com>
Date: Fri, 3 Feb 2006 21:32:38 +0000
Subject:  * sync fedora/redhat initscripts with fedora/redhat shipped packages

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1127 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 initscript/fedora/avahi-daemon.in   | 33 ++++++++++++++++++++++++---------
 initscript/fedora/avahi-dnsconfd.in | 20 ++++++++++++++++----
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/initscript/fedora/avahi-daemon.in b/initscript/fedora/avahi-daemon.in
index b9907be..aead1be 100644
--- a/initscript/fedora/avahi-daemon.in
+++ b/initscript/fedora/avahi-daemon.in
@@ -2,7 +2,7 @@
 #
 # avahi-daemon:       Starts the Avahi Daemon
 #
-# chkconfig: 345 34 66
+# chkconfig: 345 98 02
 # description: This is a daemon which runs on client machines to perform \
 #              Zeroconf service discovery on a network. avahi-daemon must be \
 #              running on systems  that use Avahi for service discovery. \
@@ -23,33 +23,46 @@ OTHER_AVAHI_OPTS=""
 AVAHI_BIN=@sbindir@/avahi-daemon
 test -x $AVAHI_BIN || exit 5
 
+LOCKFILE=/var/lock/subsys/avahi-daemon
+
+base=${0##*/}
+
 start() {
 	echo -n $"Starting Avahi daemon... "
+	if [ -s /etc/localtime ]; then
+	    cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
+	fi;
         $AVAHI_BIN -D
 	RETVAL=$?
-	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
+	if [ $RETVAL = 0 ]; then
+		touch $LOCKFILE
+		success $"$base startup"
+	else
+		failure $"$base startup"
+	fi
 	echo
 	return $RETVAL
 }
 
 stop() {
-        echo -n "Shutting down Avahi daemon: "
+        echo -n $"Shutting down Avahi daemon: "
         $AVAHI_BIN -k
 	RETVAL=$?
+	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
+	rm -f $LOCKFILE
 	echo
 	return $RETVAL
 }
 
 reload() {
-        echo -n "Reloading Avahi daemon... "
+        echo -n $"Reloading Avahi daemon... "
         $AVAHI_BIN -r
 	RETVAL=$?
-	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
+	[ $RETVAL = 0 ] && success $"$base reload" || failure $"$base reload"
 	echo
 	return $RETVAL
 }
 
-
 restart() {
 	stop
 	start
@@ -67,7 +80,7 @@ case "$1" in
 	;;
   status)
         $AVAHI_BIN -c
-	[ $? = 0 ] && echo "Avahi daemon is running" || echo "Avahi daemon is not running"
+	[ $? = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
 	;;
   restart)
 	restart
@@ -76,8 +89,9 @@ case "$1" in
         reload 
 	;;
   condrestart)
-        $AVAHI_BIN -c
-        [ $? = 0 ] && restart || :
+  	if [ -f $LOCKFILE ]; then
+		restart
+	fi
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
@@ -85,3 +99,4 @@ case "$1" in
 esac
 
 exit $?
+
diff --git a/initscript/fedora/avahi-dnsconfd.in b/initscript/fedora/avahi-dnsconfd.in
index 5fbdb01..deb81fb 100644
--- a/initscript/fedora/avahi-dnsconfd.in
+++ b/initscript/fedora/avahi-dnsconfd.in
@@ -2,7 +2,7 @@
 #
 # avahi-daemon:       Starts the Avahi dns configuration daemon
 #
-# chkconfig: - 34 66
+# chkconfig: - 34 98 02
 # 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
 #       on the local LAN. This is useful for configuring unicast DNS servers in
@@ -23,11 +23,18 @@ OTHER_AVAHI_OPTS=""
 AVAHI_BIN=@sbindir@/avahi-dnsconfd
 test -x $AVAHI_BIN || exit 5
 
+LOCKFILE=/var/lock/subsys/avahi-daemon
+
 start() {
 	echo -n $"Starting Avahi DNS daemon... "
         $AVAHI_BIN -D
 	RETVAL=$?
-	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
+	if [ $RETVAL = 0 ]; then
+		touch $LOCKFILE
+		success $"$base startup"
+	else
+		failure $"$base startup"
+	fi
 	echo
 	return $RETVAL
 }
@@ -36,6 +43,8 @@ stop() {
         echo -n "Shutting down Avahi DNS daemon: "
         $AVAHI_BIN -k
 	RETVAL=$?
+	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
+	rm -f $LOCKFILE
 	echo
 	return $RETVAL
 }
@@ -76,12 +85,15 @@ case "$1" in
         reload 
 	;;
   condrestart)
-        $AVAHI_BIN -c
-        [ $? = 0 ] && restart || :
+  	if [ -f $LOCKFILE ]; then
+		restart
+	fi
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
 	exit 1
+	;;
 esac
 
 exit $?
+
-- 
cgit