X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=initscript%2Ffedora%2Favahi-dnsconfd.in;h=d109e3f75eed95e4f06698b044a20a4d3ba84aec;hb=5dbbdff597b01d5dab06f3d23d41f4dbb9f7ba9b;hp=5fbdb01ec68ee283bd393239580d297fd58c6565;hpb=2a2ee0be70b99239f2cf99ea5b663eda965599f8;p=catta

diff --git a/initscript/fedora/avahi-dnsconfd.in b/initscript/fedora/avahi-dnsconfd.in
index 5fbdb01..d109e3f 100644
--- a/initscript/fedora/avahi-dnsconfd.in
+++ b/initscript/fedora/avahi-dnsconfd.in
@@ -2,10 +2,10 @@
 #
 # avahi-daemon:       Starts the Avahi dns configuration daemon
 #
-# chkconfig: - 34 66
-# 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
+# chkconfig: - 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 \
 #       a DHCP-like fashion with mDNS.
 # processname: avahi-dnsconfd
 # config: 
@@ -23,25 +23,34 @@ OTHER_AVAHI_OPTS=""
 AVAHI_BIN=@sbindir@/avahi-dnsconfd
 test -x $AVAHI_BIN || exit 5
 
+LOCKFILE=/var/lock/subsys/avahi-dnsconfd
+
 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
 }
 
 stop() {
-        echo -n "Shutting down Avahi DNS daemon: "
+        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
 }
 
 reload() {
-        echo -n "Reloading Avahi DNS daemon... "
+        echo -n $"Reloading Avahi DNS daemon... "
         $AVAHI_BIN -r
 	RETVAL=$?
 	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
@@ -67,7 +76,8 @@ case "$1" in
 	;;
   status)
         $AVAHI_BIN -c
-	[ $? = 0 ] && echo "Avahi DNS daemon is running" || echo "Avahi DNS daemon is not running"
+        RETVAL=$?
+        [ $RETVAL = 0 ] && echo $"Avahi DNS daemon is running" || echo $"Avahi DNS daemon is not running"
 	;;
   restart)
 	restart
@@ -76,12 +86,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 $?
+exit $RETVAL
+