summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorajs <ajs>2005-01-15 17:26:48 +0000
committerajs <ajs>2005-01-15 17:26:48 +0000
commitb854038bd03e6c54b46d35bf4e40d0f39e30dfde (patch)
tree67477de86881b5296083e184a6d136812d6f4a40
parentcb585b65d1a513fd62449cc031e273245a8fd6c0 (diff)
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)
-rw-r--r--ChangeLog6
-rw-r--r--redhat/quagga.spec.in3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b6780eb3..a7728887 100644
--- 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 b22ebc57..e45ec1f1 100644
--- 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