[ucarp/el6] Drop MASTER from init.

Jon Ciesla limb at fedoraproject.org
Wed Jan 23 19:05:30 UTC 2013


commit da59abbadd7d2257725a541ef1f1e81d6a29c6d5
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Jan 23 13:02:44 2013 -0600

    Drop MASTER from init.

 ucarp.init |    3 ++-
 ucarp.spec |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/ucarp.init b/ucarp.init
index dfcf3e9..c2e01e1 100755
--- a/ucarp.init
+++ b/ucarp.init
@@ -62,7 +62,8 @@ start() {
 
            # If a value for MASTER is set in the file, use it to set advskew value
            # The default advskew is 0, so if we are not the master, add advskew=1 to the options
-           [ "${MASTER:-NULL}" == "${SOURCE_ADDRESS}" ] || OPTIONS="${OPTIONS} --advskew=1"
+           #commented out per BZ 896576
+           #[ "${MASTER:-NULL}" == "${SOURCE_ADDRESS}" ] || OPTIONS="${OPTIONS} --advskew=1"
 
            # Set the ID from the config file if it's defined, otherwise guess from the filename
            if [[ -z "$ID" ]]; then
diff --git a/ucarp.spec b/ucarp.spec
index c7d27e1..86ca95b 100644
--- a/ucarp.spec
+++ b/ucarp.spec
@@ -1,7 +1,7 @@
 Summary: Common Address Redundancy Protocol (CARP) for Unix
 Name: ucarp
 Version: 1.5.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 # See the COPYING file which details everything
 License: MIT and BSD
 Group: System Environment/Daemons
@@ -100,6 +100,9 @@ fi
 %{_sbindir}/ucarp
 
 %changelog
+* Wed Jan 23 2013 Jon Ciesla <limburgher at gmail.com> - 1.5.2-7
+- Dropped MASTER from init, BZ 896576.
+
 * Tue Dec 11 2012 Jon Ciesla <limburgher at gmail.com> - 1.5.2-6
 - init fix from Alexander Bostrom, BZ 809421.
 


More information about the scm-commits mailing list