shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Fix --with-clvmd=all to deal with the case where no cluster managers are available.

Browse Source 
Also simplify the check by removing an unnecessary variable and update
configure messages.
This commit is contained in:
Fabio M. Di Nitto 2009-09-01 19:11:45 +00:00
parent ac7d720725
commit 8c222979e5
3 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.52 -
=================================
Fix clvmd autodetection check and cleanup related configure messages.
Fix Makefile distclean target.
Make clvmd check corosync to see what cluster interface it should use.
Rewrite clvmd configuration code to cope with all combinations of libs.

32
configure vendored
View File

@ -1539,7 +1539,7 @@ Optional Packages:
--with-mirrors=TYPE Mirror support: internal/shared/none
TYPE=internal
--with-clvmd=TYPE Build cluster LVM Daemon.
The following locking combinations are valid:
The following cluster manager combinations are valid:
* cman,gulm (RHEL4 or equivalent)
* cman (RHEL5 or equivalent)
* cman,corosync,openais (or selection of them)
@ -11623,35 +11623,39 @@ fi
fi
if test x$CLVMD = xall; then
CLVMD=none
if test x$HAVE_CCS = xyes && \
test x$HAVE_GULM = xyes; then
{ $as_echo "$as_me:$LINENO: result: Enabling clvmd gulm backend" >&5
$as_echo "Enabling clvmd gulm backend" >&6; }
NEWCLVMD="$NEWCLVMD,gulm"
{ $as_echo "$as_me:$LINENO: result: Enabling clvmd gulm cluster manager" >&5
$as_echo "Enabling clvmd gulm cluster manager" >&6; }
CLVMD="$CLVMD,gulm"
fi
if test x$HAVE_CMAN = xyes && \
test x$HAVE_DLM = xyes; then
{ $as_echo "$as_me:$LINENO: result: Enabling clvmd cman backend" >&5
$as_echo "Enabling clvmd cman backend" >&6; }
NEWCLVMD="$NEWCLVMD,cman"
{ $as_echo "$as_me:$LINENO: result: Enabling clvmd cman cluster manager" >&5
$as_echo "Enabling clvmd cman cluster manager" >&6; }
CLVMD="$CLVMD,cman"
fi
if test x$HAVE_COROSYNC = xyes && \
test x$HAVE_QUORUM = xyes && \
test x$HAVE_CPG = xyes && \
test x$HAVE_DLM = xyes && \
test x$HAVE_CONFDB = xyes; then
{ $as_echo "$as_me:$LINENO: result: Enabling clvmd corosync backend" >&5
$as_echo "Enabling clvmd corosync backend" >&6; }
NEWCLVMD="$NEWCLVMD,corosync"
{ $as_echo "$as_me:$LINENO: result: Enabling clvmd corosync cluster manager" >&5
$as_echo "Enabling clvmd corosync cluster manager" >&6; }
CLVMD="$CLVMD,corosync"
fi
if test x$HAVE_COROSYNC = xyes && \
test x$HAVE_CPG = xyes && \
test x$HAVE_SALCK = xyes; then
{ $as_echo "$as_me:$LINENO: result: Enabling clvmd openais backend" >&5
$as_echo "Enabling clvmd openais backend" >&6; }
NEWCLVMD="$NEWCLVMD,openais"
{ $as_echo "$as_me:$LINENO: result: Enabling clvmd openais cluster manager" >&5
$as_echo "Enabling clvmd openais cluster manager" >&6; }
CLVMD="$CLVMD,openais"
fi
if test x$CLVMD = xnone; then
{ $as_echo "$as_me:$LINENO: result: Disabling clvmd build. No cluster manager detected." >&5
$as_echo "Disabling clvmd build. No cluster manager detected." >&6; }
fi
CLVMD="$NEWCLVMD"
fi
################################################################################

23
configure.in
View File

@ -326,7 +326,7 @@ dnl -- Build cluster LVM daemon
AC_MSG_CHECKING(whether to build cluster LVM daemon)
AC_ARG_WITH(clvmd,
[ --with-clvmd=TYPE Build cluster LVM Daemon.
The following locking combinations are valid:
The following cluster manager combinations are valid:
* cman,gulm (RHEL4 or equivalent)
* cman (RHEL5 or equivalent)
* cman,corosync,openais (or selection of them)
@ -522,31 +522,34 @@ fi
dnl -- If we are autodetecting, we need to re-create
dnl -- the depedencies checks and set a proper CLVMD.
if test x$CLVMD = xall; then
CLVMD=none
if test x$HAVE_CCS = xyes && \
test x$HAVE_GULM = xyes; then
AC_MSG_RESULT([Enabling clvmd gulm backend])
NEWCLVMD="$NEWCLVMD,gulm"
AC_MSG_RESULT([Enabling clvmd gulm cluster manager])
CLVMD="$CLVMD,gulm"
fi
if test x$HAVE_CMAN = xyes && \
test x$HAVE_DLM = xyes; then
AC_MSG_RESULT([Enabling clvmd cman backend])
NEWCLVMD="$NEWCLVMD,cman"
AC_MSG_RESULT([Enabling clvmd cman cluster manager])
CLVMD="$CLVMD,cman"
fi
if test x$HAVE_COROSYNC = xyes && \
test x$HAVE_QUORUM = xyes && \
test x$HAVE_CPG = xyes && \
test x$HAVE_DLM = xyes && \
test x$HAVE_CONFDB = xyes; then
AC_MSG_RESULT([Enabling clvmd corosync backend])
NEWCLVMD="$NEWCLVMD,corosync"
AC_MSG_RESULT([Enabling clvmd corosync cluster manager])
CLVMD="$CLVMD,corosync"
fi
if test x$HAVE_COROSYNC = xyes && \
test x$HAVE_CPG = xyes && \
test x$HAVE_SALCK = xyes; then
AC_MSG_RESULT([Enabling clvmd openais backend])
NEWCLVMD="$NEWCLVMD,openais"
AC_MSG_RESULT([Enabling clvmd openais cluster manager])
CLVMD="$CLVMD,openais"
fi
if test x$CLVMD = xnone; then
AC_MSG_RESULT([Disabling clvmd build. No cluster manager detected.])
fi
CLVMD="$NEWCLVMD"
fi
################################################################################