- resolves: #246875: Initscript Review

avahi-0.6.21-initscript.patch

@@ -0,0 +1,81 @@
+diff -up avahi-0.6.21/initscript/fedora/avahi-daemon.in.initscript avahi-0.6.21/initscript/fedora/avahi-daemon.in
+--- avahi-0.6.21/initscript/fedora/avahi-daemon.in.initscript	2007-08-28 15:00:24.000000000 +0200
++++ avahi-0.6.21/initscript/fedora/avahi-daemon.in	2007-08-28 17:34:28.000000000 +0200
+@@ -14,20 +14,25 @@ OTHER_AVAHI_OPTS=""
+ 
+ # Source function library.
+ . /etc/init.d/functions
+-
+ . /etc/sysconfig/network
+ 
+-# Check that networking is configured.
+-[ ${NETWORKING} = "no" ] && exit 0
+ 
+ AVAHI_BIN=@sbindir@/avahi-daemon
+-test -x $AVAHI_BIN || exit 5
++
++if [ $1 == 'status' ]; then
++    test -x $AVAHI_BIN || exit 4
++else 
++    test -x $AVAHI_BIN || exit 5
++fi
+ 
+ LOCKFILE=/var/lock/subsys/avahi-daemon
+ 
+ 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
+@@ -96,7 +101,7 @@ case "$1" in
+ 	;;
+   *)
+ 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+-	exit 1
++	exit 2
+ esac
+ 
+ exit $RETVAL
+diff -up avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in.initscript avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in
+--- avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in.initscript	2007-08-28 17:35:07.000000000 +0200
++++ avahi-0.6.21/initscript/fedora/avahi-dnsconfd.in	2007-08-28 17:36:48.000000000 +0200
+@@ -14,18 +14,21 @@ OTHER_AVAHI_OPTS=""
+ 
+ # Source function library.
+ . /etc/init.d/functions
+-
+ . /etc/sysconfig/network
+ 
+-# Check that networking is configured.
+-[ ${NETWORKING} = "no" ] && exit 0
+-
+ AVAHI_BIN=@sbindir@/avahi-dnsconfd
+-test -x $AVAHI_BIN || exit 5
++if [ $1 == 'status' ]; then
++    test -x $AVAHI_BIN || exit 4
++else 
++    test -x $AVAHI_BIN || exit 5
++fi
+ 
+ LOCKFILE=/var/lock/subsys/avahi-dnsconfd
+ 
+ start() {
++    # Check that networking is configured.
++    [ ${NETWORKING} = "no" ] && exit 1
++
+ 	echo -n $"Starting Avahi DNS daemon... "
+         $AVAHI_BIN -D
+ 	RETVAL=$?
+@@ -92,7 +95,7 @@ case "$1" in
+ 	;;
+   *)
+ 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+-	exit 1
++	exit 2
+ 	;;
+ esac
+ 

avahi.spec

@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -38,6 +38,7 @@ Source0:        http://avahi.org/download/%{name}-%{version}.tar.gz
 # enable mono's mcs to work in beehive buildroot:
 Patch1:     avahi-0.6.21-avahi-browse-help-fix.patch
 Patch2:     avahi-0.6.3-MONO_SHARED_DIR.patch
+Patch3:     avahi-0.6.21-initscript.patch
 
 %description
 Avahi is a system which facilitates service discovery on
@@ -210,6 +211,7 @@ fashion with mDNS.
 %patch1 -p0 -b .avahi-browse-help-fix
 %if %{WITH_MONO}
 %patch2 -p1 -b .MONO_SHARED_DIR
+%patch3 -p1 -b .initscript
 %endif
 
 %build
@@ -464,6 +466,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 28 2007 Martin Bacovsky <mbacovsk@redhat.com> - 0.6.21-3
+- resolves: #246875: Initscript Review
+
 * Sun Aug 12 2007 Lennart Poettering <lpoetter@redhat.com> - 0.6.21-2
 - Fix avahi-browse --help output