2005-01-15 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* redhat/quagga.spec.in: Fix postun script to avoid misleading error
	  message saying the postun scriptlet failed when watchquagga
	  is not running.

          (pullup candidate)

diff --git a/ChangeLog b/ChangeLog
index b6780eb35ddbebbbe27b33afd1dab3833b529147..a7728887278fcd4dcd3b8e94f906fad9fd194248 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-15 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+       * redhat/quagga.spec.in: Fix postun script to avoid misleading error
+         message saying the postun scriptlet failed when watchquagga
+         is not running.
+
 2005-01-12 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * configure.ac: Test for header file <ucontext.h> (for use in

diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index b22ebc57aa644822f954e580ab19cd5b231bff2e..e45ec1f144474cec21c7523d5e3ae8fc2acc4951 100644 (file)
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -306,8 +306,9 @@ if [ "$1" -ge 1 ]; then
                        /etc/rc.d/init.d/$daemon start >/dev/null 2>&1
        done
        # Start watchquagga last.
+       # Avoid postun scriptlet error if watchquagga is not running. 
        [ "$running_watchquagga" = yes ] && \
-               /etc/rc.d/init.d/watchquagga start >/dev/null 2>&1
+               /etc/rc.d/init.d/watchquagga start >/dev/null 2>&1 || :
 fi
 
 %preun