Author: alucard Date: Sat Jul 17 17:54:08 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.02.69
- pldized clvm.init script (patch)
- bcond to build clvmd against 3rd generation of cluster suite
---- Files affected:
packages/lvm2:
lvm2.spec (1.151 -> 1.152) , lvm2-clvmd_init.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/lvm2/lvm2.spec
diff -u packages/lvm2/lvm2.spec:1.151 packages/lvm2/lvm2.spec:1.152
--- packages/lvm2/lvm2.spec:1.151 Sun Jun 20 21:05:54 2010
+++ packages/lvm2/lvm2.spec Sat Jul 17 19:54:03 2010
@@ -8,6 +8,7 @@
%bcond_without dietlibc # link initrd version with dietlibc
%bcond_with glibc # link initrd version with static glibc
%bcond_without clvmd # don't build clvmd
+%bcond_with clvmd3 # build clvmd for 3rd generation of cluster
%bcond_without selinux # disable SELinux
%ifarch sparc64 sparc
@@ -23,20 +24,25 @@
%undefine with_dietlibc
%endif
+%if %{with clvmd3}
+%undefine with_clvmd
+%endif
+
Summary: The new version of Logical Volume Manager for Linux
Summary(pl.UTF-8): Nowa wersja Logical Volume Managera dla Linuksa
Name: lvm2
-Version: 2.02.67
+Version: 2.02.69
Release: 1
License: GPL v2
Group: Applications/System
Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
-# Source0-md5: 088d037e77660f48cd1591e91ed59d20
+# Source0-md5: 2463f4ee7da9015af4b62a4e691fff76
Source1: %{name}-initramfs-hook
Source2: %{name}-initramfs-local-top
Patch0: %{name}-selinux.patch
Patch1: %{name}-diet.patch
Patch2: device-mapper-dmsetup-export.patch
+Patch3: %{name}-clvmd_init.patch
URL: http://sources.redhat.com/lvm2/
BuildRequires: autoconf
BuildRequires: automake
@@ -56,6 +62,10 @@
BuildRequires: cman-devel >= 1.0
BuildRequires: dlm-devel >= 1.0-0.pre21.2
%endif
+%if %{with clvmd3}
+BuildRequires: cluster-cman-devel
+BuildRequires: cluster-dlm-devel
+%endif
BuildRequires: ncurses-devel
BuildRequires: readline-devel
Requires: device-mapper >= %{version}-%{release}
@@ -63,6 +73,10 @@
Requires: cman-libs >= 1.0
Requires: dlm >= 1.0-0.pre21.2
%endif
+%if %{with clvmd3}
+Requires: cluster-cman-libs
+Requires: cluster-dlm
+%endif
%{?with_selinux:Requires: libselinux >= 1.10}
# doesn't work with 2.4 kernels
Requires: uname(release) >= 2.6
@@ -214,6 +228,7 @@
%{?with_selinux:%patch0 -p1}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
cp -f /usr/share/automake/config.sub autoconf
@@ -333,6 +348,7 @@
%dir %{_libdir}/device-mapper
%attr(755,root,root) %{_libdir}/device-mapper/*.so
%{_mandir}/man8/dmsetup.8*
+%{_mandir}/man8/dmeventd.8*
%files -n device-mapper-devel
%defattr(644,root,root,755)
@@ -373,6 +389,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.152 2010/07/17 17:54:03 alucard
+- up to 2.02.69
+- pldized clvm.init script (patch)
+- bcond to build clvmd against 3rd generation of cluster suite
+
Revision 1.151 2010/06/20 19:05:54 qboosh
- updated to 2.02.67
- readline todo outdated
================================================================
Index: packages/lvm2/lvm2-clvmd_init.patch
diff -u /dev/null packages/lvm2/lvm2-clvmd_init.patch:1.1
--- /dev/null Sat Jul 17 19:54:08 2010
+++ packages/lvm2/lvm2-clvmd_init.patch Sat Jul 17 19:54:03 2010
@@ -0,0 +1,73 @@
+--- LVM2.2.02.67/scripts/clvmd_init_red_hat.in 2010-07-17 18:33:02.185014713
+0200
++++ LVM2.2.02.67/scripts/clvmd_init_red_hat.in 2010-07-17 18:59:14.831553676
+0200
+@@ -64,9 +64,8 @@ rh_status_q() {
+ start()
+ {
+ if ! rh_status_q; then
+- echo -n "Starting $DAEMON: "
++ msg_starting "$DAEMON"
+ daemon $DAEMON $CLVMDOPTS || return $?
+- echo
+ fi
+
+ # Refresh local cache.
+@@ -86,7 +85,7 @@ start()
+
+ ${lvm_vgscan} > /dev/null 2>&1
+
+- action "Activating VG(s):" ${lvm_vgchange} -ayl $LVM_VGS || return $?
++ run_cmd "Activating VG(s):" ${lvm_vgchange} -ayl $LVM_VGS || return $?
+
+ touch $LOCK_FILE
+
+@@ -111,27 +110,23 @@ stop()
+
+ [ -z "$LVM_VGS" ] && LVM_VGS="$(clustered_vgs)"
+ if [ -n "$LVM_VGS" ]; then
+- action "Deactivating clustered VG(s):" ${lvm_vgchange} -anl
$LVM_VGS || return $?
++ run_cmd "Deactivating clustered VG(s):" ${lvm_vgchange} -anl
$LVM_VGS || return $?
+ fi
+
+- action "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) ||
return $?
++ run_cmd "Signaling $DAEMON to exit" kill -TERM $(pidofproc $DAEMON) ||
return $?
+
+ # wait half second before we start the waiting loop or we will show
+ # the loop more time than really necessary
+ usleep 500000
+
+ # clvmd could take some time to stop
+- rh_status_q && action "Waiting for $DAEMON to exit:" wait_for_finish
++ rh_status_q && run_cmd "Waiting for $DAEMON to exit:" wait_for_finish
+
+ if rh_status_q; then
+- echo -n "$DAEMON failed to exit"
+- failure
+- echo
++ fail
+ return 1
+ else
+- echo -n "$DAEMON terminated"
+- success
+- echo
++ ok
+ fi
+
+ rm -f $LOCK_FILE
+@@ -141,7 +136,7 @@ stop()
+
+ reload() {
+ rh_status_q || exit 7
+- action "Reloading $DAEMON configuration: " $DAEMON -R || return $?
++ run_cmd "Reloading $DAEMON configuration: " $DAEMON -R || return $?
+ }
+
+ restart() {
+@@ -152,7 +147,7 @@ restart() {
+
+ # Try to get clvmd to restart itself. This will preserve
+ # exclusive LV locks
+- action "Restarting $DAEMON: " $DAEMON -S
++ run_cmd "Restarting $DAEMON: " $DAEMON -S
+
+ # If that fails then do a normal stop & restart
+ if [ $? != 0 ]; then
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2.spec?r1=1.151&r2=1.152&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
