OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=11

enable-clvmd.patch

@@ -0,0 +1,65 @@
+--- daemons/clvmd/clvmd.c
++++ daemons/clvmd/clvmd.c
+@@ -37,7 +37,7 @@
+ #include <getopt.h>
+ #include <syslog.h>
+ #include <errno.h>
+-#include <libdlm.h>
++//#include <libdlm.h>
+ 
+ #include "clvmd-comms.h"
+ #include "lvm-functions.h"
+--- daemons/clvmd/clvmd-command.c
++++ daemons/clvmd/clvmd-command.c
+@@ -65,7 +65,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <libdevmapper.h>
+-#include <libdlm.h>
++//#include <libdlm.h>
+ 
+ #include "list.h"
+ #include "locking.h"
+--- daemons/clvmd/clvm.h
++++ daemons/clvmd/clvm.h
+@@ -68,4 +68,29 @@
+ #define CLVMD_CMD_GET_CLUSTERNAME   41
+ #define CLVMD_CMD_SET_DEBUG	    42
+ #define CLVMD_CMD_VG_BACKUP	    43
++
++/* Lock modes: */
++#define LKM_NLMODE      0               /* null lock */
++#define LKM_CRMODE      1               /* concurrent read */
++#define LKM_CWMODE      2               /* concurrent write */
++#define LKM_PRMODE      3               /* protected read */
++#define LKM_PWMODE      4               /* protected write */
++#define LKM_EXMODE      5               /* exclusive */
++/* Locking flags - these match the ones
++ * in dlm.h
++ */
++#define LKF_NOQUEUE        (0x00000001)
++#define LKF_CANCEL         (0x00000002)
++#define LKF_CONVERT        (0x00000004)
++#define LKF_VALBLK         (0x00000008)
++#define LKF_QUECVT         (0x00000010)
++#define LKF_IVVALBLK       (0x00000020)
++#define LKF_CONVDEADLK     (0x00000040)
++#define LKF_PERSISTENT     (0x00000080)
++#define LKF_NODLCKWT       (0x00000100)
++#define LKF_NODLCKBLK      (0x00000200)
++#define LKF_EXPEDITE       (0x00000400)
++#define LKF_NOQUEUEBAST    (0x00000800)
++#define LKF_HEADQUE        (0x00001000)
++#define LKF_NOORDER        (0x00002000)
+ #endif
+--- daemons/clvmd/lvm-functions.c
++++ daemons/clvmd/lvm-functions.c
+@@ -31,7 +31,7 @@
+ #include <syslog.h>
+ #include <assert.h>
+ #include <libdevmapper.h>
+-#include <libdlm.h>
++//#include <libdlm.h>
+ 
+ #include "list.h"
+ #include "lvm-types.h"

lvm2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 22 10:47:17 CEST 2008 - xwhu@suse.de
+
+- Enable CLVM support in LVM2 
+
 -------------------------------------------------------------------
 Wed Feb 20 11:47:30 CET 2008 - fehr@suse.de
 

lvm2.spec

@@ -11,7 +11,7 @@
 
 
 Name:           lvm2
-BuildRequires:  device-mapper-devel module-init-tools
+BuildRequires:  device-mapper-devel module-init-tools openais-devel
 License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/Base
 Requires:       device-mapper >= 1.02.23
@@ -22,7 +22,7 @@ PreReq:         %fillup_prereq %insserv_prereq
 %endif
 AutoReqProv:    on
 Version:        2.02.33
-Release:        4
+Release:        15
 Summary:        LVM2 Tools
 Source:         LVM2.%{version}.tar.bz2
 Source1:        lvm.conf
@@ -36,6 +36,7 @@ Patch5:         pvscan_2TB_limit.diff
 Patch6:         man_page_sectors.diff
 Patch10:        lvm-no_chown.diff
 Patch11:        cmdline_large_minor.diff
+Patch12:        enable-clvmd.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -53,13 +54,15 @@ Volume Manager.
 %patch5
 %patch6
 %patch10
+%patch12
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" MODPROBE_CMD=/sbin/modprobe \
+LDFLAGS="-L /usr/%_lib/openais" \
 ./configure --prefix=/ \
 	--mandir=%{_mandir} \
 	--includedir=/usr/include \
-	--libdir=/%_lib --enable-dmeventd --enable-cmdlib
+	--libdir=/%_lib --enable-dmeventd --enable-cmdlib --with-clvmd=openais
 make
 
 %install
@@ -69,6 +72,8 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/backup
 install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/archive
 install -d -m 755 $RPM_BUILD_ROOT/etc/lvm/metadata
 install -d -m 755 $RPM_BUILD_ROOT/var/lock/lvm
+install -D -m 755 $RPM_BUILD_ROOT/sbin/clvmd $RPM_BUILD_ROOT/usr/sbin/clvmd
+rm $RPM_BUILD_ROOT/sbin/clvmd
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/lvm
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 install -m 744 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d
@@ -96,6 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/lvm/lvm.conf
 %config /etc/init.d/boot.lvm
 /var/adm/fillup-templates/sysconfig.lvm
+/usr/sbin/clvmd
 /sbin/fsadm
 /sbin/lvchange
 /sbin/lvconvert
@@ -147,6 +153,7 @@ rm -rf $RPM_BUILD_ROOT
 /%_lib/libdevmapper-event-lvm2snapshot.so.2.02
 /%_lib/liblvm2cmd.so
 /%_lib/liblvm2cmd.so.2.02
+%{_mandir}/man8/clvmd.8.gz
 %{_mandir}/man5/lvm.conf.5.gz
 %{_mandir}/man8/lvchange.8.gz
 %{_mandir}/man8/lvcreate.8.gz
@@ -192,6 +199,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/vgsplit.8.gz
 
 %changelog
+* Tue Apr 22 2008 xwhu@suse.de
+- Enable CLVM support in LVM2
 * Wed Feb 20 2008 fehr@suse.de
 - allow large minor number on command line with option --minor
   (bnc#362960)