rpms/radvd/F-8 radvd-1.0-initscript.patch, 1.1, 1.2 radvd.spec, 1.39, 1.40

[Martin Bacovsky (mbacovsk)]

Author: mbacovsk

Update of /cvs/pkgs/rpms/radvd/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8413

Modified Files:
	radvd-1.0-initscript.patch radvd.spec 
Log Message:
* Tue Nov 13 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.0-5
- resolves #376081: The radvd init script exits without doing anything if /usr/sbin/radvd exists


radvd-1.0-initscript.patch:

Index: radvd-1.0-initscript.patch
===================================================================
RCS file: /cvs/pkgs/rpms/radvd/F-8/radvd-1.0-initscript.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radvd-1.0-initscript.patch	3 Aug 2007 12:24:19 -0000	1.1
+++ radvd-1.0-initscript.patch	13 Nov 2007 11:11:54 -0000	1.2
@@ -1,5 +1,6 @@
---- radvd-1.0/redhat/radvd.init.initscript	2007-08-03 11:50:05.000000000 +0200
-+++ radvd-1.0/redhat/radvd.init	2007-08-03 13:37:33.000000000 +0200
+diff -up radvd-1.0/redhat/radvd.init.initscript radvd-1.0/redhat/radvd.init
+--- radvd-1.0/redhat/radvd.init.initscript	2002-01-08 10:00:50.000000000 +0100
++++ radvd-1.0/redhat/radvd.init	2007-11-12 17:12:17.000000000 +0100
 @@ -2,7 +2,10 @@
  #
  # $Id$
@@ -30,9 +31,9 @@
  
 -[ -f /usr/sbin/radvd ] || exit 0
 +if [ $1 == 'status' ]; then
-+	[ -f /usr/sbin/radvd ] && exit 4
++	[ -f /usr/sbin/radvd ] || exit 4
 +else 
-+	[ -f /usr/sbin/radvd ] && exit 1
++	[ -f /usr/sbin/radvd ] || exit 1
 +fi
  
  RETVAL=0
@@ -66,7 +67,7 @@
  	;;
    status)
  	status radvd
-@@ -58,13 +68,13 @@
+@@ -58,13 +68,13 @@ case "$1" in
  	RETVAL=$?
  	;;
    reload)
@@ -82,7 +83,7 @@
  		$0 stop
  		$0 start
  		RETVAL=$?
-@@ -72,7 +82,7 @@
+@@ -72,7 +82,7 @@ case "$1" in
          ;;  
    *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"


Index: radvd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/radvd/F-8/radvd.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- radvd.spec	23 Aug 2007 09:53:59 -0000	1.39
+++ radvd.spec	13 Nov 2007 11:11:54 -0000	1.40
@@ -5,7 +5,7 @@
 Summary:    A Router Advertisement daemon
 Name:       radvd
 Version:    1.0
-Release:    4.1%{?dist}
+Release:    5%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD-style
 Group:      System Environment/Daemons
@@ -94,6 +94,9 @@
 %{_sbindir}/radvdump
 
 %changelog
+* Tue Nov 13 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.0-5
+- resolves #376081: The radvd init script exits without doing anything if /usr/sbin/radvd exists
+
 * Thu Aug 23 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.0-4.1
 - Rebuild