X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=initscript%2Ffedora%2Favahi-daemon.in;h=d30986652d88ae6f0fb268d287c06bcb936cdb75;hb=c7ecad8fa467b8be2b34064020e2c541c480645e;hp=b9907bed0c6a045025173729cabcaf14ba762ae2;hpb=2a2ee0be70b99239f2cf99ea5b663eda965599f8;p=catta

diff --git a/initscript/fedora/avahi-daemon.in b/initscript/fedora/avahi-daemon.in
index b9907be..d309866 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 96 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. \
@@ -10,46 +10,63 @@
 # processname: avahi-daemon
 # config: 
 
+AVAHI_BIN=@sbindir@/avahi-daemon
+
+if [ "$1" == 'status' ]; then
+    test -x $AVAHI_BIN || exit 4
+else 
+    test -x $AVAHI_BIN || exit 5
+fi
+
 OTHER_AVAHI_OPTS=""
 
 # Source function library.
 . /etc/init.d/functions
-
 . /etc/sysconfig/network
 
-# Check that networking is configured.
-[ ${NETWORKING} = "no" ] && exit 0
+LOCKFILE=/var/lock/subsys/avahi-daemon
 
-AVAHI_BIN=@sbindir@/avahi-daemon
-test -x $AVAHI_BIN || exit 5
+base=${0##*/}
 
 start() {
+    # Check that networking is configured.
+    [ ${NETWORKING} = "no" ] && exit 1
+
 	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 +84,8 @@ case "$1" in
 	;;
   status)
         $AVAHI_BIN -c
-	[ $? = 0 ] && echo "Avahi daemon is running" || echo "Avahi daemon is not running"
+    	RETVAL=$?
+    	[ $RETVAL = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
 	;;
   restart)
 	restart
@@ -76,12 +94,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
+	exit 2
+        ;;
 esac
 
-exit $?
+exit $RETVAL
+