Hi,
several times it's been reported that make install will override
the installed configuration.
This is wrong.
Instead of shipping/installing corosync.conf (that in 99.9% of the case
it needs to be customized), ship it as corosync.conf.example and let the
user merge what they need.
The patch renames conf/corosync.conf to conf/corosync.conf.example and
update the toplevel Makefile.am (sorry but svn diff doesn't show
correctly the file rename).
Fabio
Index: conf/corosync.conf
===================================================================
--- conf/corosync.conf (revision 2092)
+++ conf/corosync.conf (working copy)
@@ -1,31 +0,0 @@
-# Please read the corosync.conf.5 manual page
-totem {
- version: 2
- secauth: off
- threads: 0
- interface {
- ringnumber: 0
- bindnetaddr: 192.168.1.1
- mcastaddr: 226.94.1.1
- mcastport: 5405
- }
-}
-
-logging {
- fileline: off
- to_stderr: yes
- to_logfile: yes
- to_syslog: yes
- logfile: /tmp/corosync.log
- debug: off
- timestamp: on
- logger_subsys {
- subsys: AMF
- debug: off
- tags: enter|leave|trace1|trace2|trace3|trace4|trace6
- }
-}
-
-amf {
- mode: disabled
-}
Index: Makefile.am
===================================================================
--- Makefile.am (revision 2092)
+++ Makefile.am (working copy)
@@ -29,7 +29,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
# THE POSSIBILITY OF SUCH DAMAGE.
-EXTRA_DIST = autogen.sh conf/corosync.conf
+EXTRA_DIST = autogen.sh conf/corosync.conf.example
AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure depcomp \
@@ -39,7 +39,7 @@
dist_doc_DATA = LICENSE INSTALL README.devmap \
README.recovery SECURITY TODO AUTHORS
-sysconf_DATA = conf/corosync.conf
+sysconf_DATA = conf/corosync.conf.example
SUBDIRS = include lcr lib exec services tools test pkgconfig man
# init
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais
