mDNSResponder-1096.100.3.tar.gz

[apple/mdnsresponder.git] / mDNSPosix / mdnsd.sh

diff --git a/mDNSPosix/mdnsd.sh b/mDNSPosix/mdnsd.sh
index ad06e0163a67b87f366392594493eb5f15c8906f..6e65612b1e2e2ef2aba8636212e006253a100df7 100644 (file)
--- a/mDNSPosix/mdnsd.sh
+++ b/mDNSPosix/mdnsd.sh
@@ -1,45 +1,21 @@
 #!/bin/sh
+# Emacs settings: -*- tab-width: 4 -*-
 #
-# Linux /etc/init.d script to start/stop the mdnsd daemon.
-# Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved.
+# Copyright (c) 2002-2006 Apple Computer, Inc. All rights reserved.
 #
-# @APPLE_LICENSE_HEADER_START@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 # 
-# This file contains Original Code and/or Modifications of Original Code
-# as defined in and that are subject to the Apple Public Source License
-# Version 2.0 (the 'License'). You may not use this file except in
-# compliance with the License. Please obtain a copy of the License at
-# http://www.opensource.apple.com/apsl/ and read it before using this
-# file.
+#     http://www.apache.org/licenses/LICENSE-2.0
 # 
-# The Original Code and all software distributed under the License are
-# distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-# EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-# INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
-# Please see the License for the specific language governing rights and
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
 # limitations under the License.
-# 
-# @APPLE_LICENSE_HEADER_END@
-#
-# $Log: mdnsd.sh,v $
-# Revision 1.6  2004/12/07 20:30:45  cheshire
-# Fix start-stop-daemon for Suse Linux (don't use -s TERM)
-#
-# Revision 1.5  2004/06/29 22:13:45  cheshire
-# Fix from Andrew White at NICTA
-#
-# Revision 1.4  2004/02/05 20:23:10  cheshire
-# Fix mdnsd.sh to work on *BSD distributions
 #
-# Revision 1.3  2004/01/19 22:47:17  cheshire
-# Define killprocterm() to do "killproc $1 -TERM" for Linux
-#
-# Revision 1.2  2003/12/11 19:42:13  cheshire
-# Change name "mDNSResponderd" to "mdnsd" for consistency with standard Linux (Unix) naming conventions
-#
-# Revision 1.1  2003/12/08 20:47:02  rpantos
-# Add support for mDNSResponder on Linux.
+# Linux /etc/init.d script to start/stop the mdnsd daemon.
 #
 # The following lines are used by the *BSD rcorder system to decide
 # the order it's going to run the rc.d scripts at startup time.
@@ -60,10 +36,11 @@ if [ -r /sbin/start-stop-daemon ]; then
        # Suse Linux doesn't work with symbolic signal names, but we really don't need
        # to specify "-s TERM" since SIGTERM (15) is the default stop signal anway
        # STOP="start-stop-daemon --stop -s TERM --quiet --oknodo --exec"
-       STOP="start-stop-daemon --stop --quiet --oknodo --exec"
+       STOP="start-stop-daemon --stop --quiet --oknodo --retry 2 --exec"
 else
        killmdnsd() {
                kill -TERM `cat /var/run/mdnsd.pid`
+               sleep 1
        }
        START=
        STOP=killmdnsd
@@ -84,7 +61,6 @@ case "$1" in
     reload|restart|force-reload)
                echo -n "Restarting Apple Darwin Multicast DNS / DNS Service Discovery daemon:"
                $STOP $DAEMON
-               sleep 1
                $START $DAEMON
                echo -n " mdnsd"
        ;;