LVMVERSION=2.02.95
DMVERSION=1.02.74
-DEBRELEASE=6
+DEBRELEASE=7
# also update debian changelog patch
PVERELEASE=${DEBRELEASE}pve1
PVEVER=${LVMVERSION}-${PVERELEASE}
-Index: LVM2.2.02.95/doc/example.conf.in
+Index: new/doc/example.conf.in
===================================================================
---- LVM2.2.02.95.orig/doc/example.conf.in 2013-03-14 10:13:30.000000000 +0100
-+++ LVM2.2.02.95/doc/example.conf.in 2013-03-14 10:13:39.000000000 +0100
+--- new.orig/doc/example.conf.in 2012-03-02 22:49:43.000000000 +0100
++++ new/doc/example.conf.in 2013-03-29 06:58:15.000000000 +0100
@@ -185,7 +185,7 @@
# to 1, discards will only be issued if both the storage and kernel provide
# support.
-Index: LVM2.2.02.95/debian/control
+Index: new/debian/control
===================================================================
---- LVM2.2.02.95.orig/debian/control 2013-03-14 09:22:00.000000000 +0100
-+++ LVM2.2.02.95/debian/control 2013-03-14 09:25:34.000000000 +0100
-@@ -1,9 +1,8 @@
+--- new.orig/debian/control 2013-03-29 07:17:35.000000000 +0100
++++ new/debian/control 2013-03-29 07:17:50.000000000 +0100
+@@ -1,9 +1,9 @@
Source: lvm2
Section: admin
Priority: optional
-Maintainer: Debian LVM Team <pkg-lvm-maintainers@lists.alioth.debian.org>
--Uploaders: Bastian Blank <waldi@debian.org>
--Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config
+Maintainer: Proxmox Support Team <support@proxmox.com>
+ Uploaders: Bastian Blank <waldi@debian.org>
+-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.1.3~), automake, libreadline-gplv2-dev, libselinux1-dev, libudev-dev, pkg-config, libcorosync-pve-dev, redhat-cluster-pve-dev, libopenais-pve-dev, quilt
Standards-Version: 3.9.1
Homepage: http://sources.redhat.com/lvm2/
Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
-@@ -38,7 +37,7 @@
+@@ -38,8 +38,7 @@
Package: clvm
Priority: extra
Architecture: any
--Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base, corosync | cman
+-Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base
+-Recommends: corosync | openais | cman
+Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base, redhat-cluster-pve
+ Multi-Arch: foreign
Description: Cluster LVM Daemon for lvm2
This package provides the clustering interface for lvm2, when used with
- Red Hat's "cman" or corosync based (eg Pacemaker) cluster infrastructure.
-Index: LVM2.2.02.95/debian/changelog
+Index: new/debian/changelog
===================================================================
---- LVM2.2.02.95.orig/debian/changelog 2013-01-02 11:12:05.000000000 +0100
-+++ LVM2.2.02.95/debian/changelog 2013-03-14 09:56:16.000000000 +0100
+--- new.orig/debian/changelog 2013-03-24 09:03:38.000000000 +0100
++++ new/debian/changelog 2013-03-29 06:57:23.000000000 +0100
@@ -1,3 +1,47 @@
+lvm2 (2.02.95-6pve1) unstable; urgency=low
+
+
+ -- Proxmox Support Team <support@proxmox.com> Tue, 20 Sep 2011 12:53:25 +0200
+
- lvm2 (2.02.95-6) unstable; urgency=low
+ lvm2 (2.02.95-7) testing; urgency=low
- * Drop cluster (clvm) support. It never properly worked and is more dead
+ * Re-enable cluster support. (closes: #697676)
--- /dev/null
+Index: new/debian/clvm.defaults
+===================================================================
+--- new.orig/debian/clvm.defaults 2013-03-03 12:46:47.000000000 +0100
++++ new/debian/clvm.defaults 2013-03-29 07:01:05.000000000 +0100
+@@ -1,9 +1,11 @@
+ # Bourne shell compatible script, sourced by /etc/init.d/clvm to set
+ # additional arguments for clvmd.
+
++# enable clmvd
++#START_CLVM=yes
++
+ # Startup timeout:
+-CLVMDTIMEOUT=20
++#CLVMDTIMEOUT=30
+
+ # Volume groups to activate on startup:
+ # LVM_VGS="cluster_vg1 cluster_vg2"
+-
+Index: new/debian/clvm.init
+===================================================================
+--- new.orig/debian/clvm.init 2013-03-03 12:46:47.000000000 +0100
++++ new/debian/clvm.init 2013-03-29 07:09:13.000000000 +0100
+@@ -2,12 +2,12 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides: clvm
+-# Required-Start: lvm2
+-# Required-Stop: lvm2
++# Required-Start: lvm2 cman
++# Required-Stop: lvm2 cman
+ # Should-Start: cman corosync openais
+ # Should-Stop: cman corosync openais
+-# Default-Start: S
+-# Default-Stop: 0 6
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
+ # Short-Description: start and stop the lvm cluster locking daemon
+ ### END INIT INFO
+ #
+@@ -32,18 +32,21 @@
+ exit 0
+ fi
+
+-if ! cman_tool status >/dev/null 2>&1; then
+- log_failure_msg "clvmd: cluster is not running. Aborting."
+- exit 0
+-fi
+-
+-CLVMDTIMEOUT=20
++CLVMDTIMEOUT=30
++START_CLVM=no
+
+ # Read configuration variable file if it is present
+ [ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
++[ "$START_CLVM" = "yes" ] || exit 0
++
+ DAEMON_OPTS="-T$CLVMDTIMEOUT"
+
++if ! cman_tool status >/dev/null 2>&1; then
++ log_failure_msg "clvmd: cluster is not running. Aborting."
++ exit 1
++fi
++
+ do_start()
+ {
+ start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS || status="$?"
+Index: new/debian/rules
+===================================================================
+--- new.orig/debian/rules 2013-03-29 06:58:07.000000000 +0100
++++ new/debian/rules 2013-03-29 07:12:46.000000000 +0100
+@@ -77,7 +77,7 @@
+ $(CONFIGURE) \
+ --libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --with-optimisation="$(CFLAGS_OPT_DEB)" \
+- --with-clvmd=cman,corosync,openais \
++ --with-clvmd=cman,corosync \
+ --with-cluster=internal \
+ --with-device-uid=0 \
+ --with-device-gid=6 \
+@@ -165,7 +165,7 @@
+ install_clvm: DIR = $(BUILD_DIR)/install_deb
+ install_clvm: $(STAMPS_DIR)/install_deb
+ +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+- dh_installinit --no-start -- start 63 S . start 51 0 6 .
++ dh_installinit --no-start -- start 63 2 3 4 5 . start 51 0 1 6 .
+ +$(MAKE_SELF) install-base
+
+ install_dmeventd: export DH_OPTIONS = -pdmeventd
-Index: LVM2.2.02.95/debian/lvm2.install
+Index: new/debian/lvm2.install
===================================================================
---- LVM2.2.02.95.orig/debian/lvm2.install 2012-05-27 16:25:21.000000000 +0200
-+++ LVM2.2.02.95/debian/lvm2.install 2013-03-14 09:57:51.000000000 +0100
+--- new.orig/debian/lvm2.install 2012-05-27 16:25:21.000000000 +0200
++++ new/debian/lvm2.install 2013-03-29 06:57:58.000000000 +0100
@@ -8,3 +8,5 @@
usr/share/man/man8/pv*
usr/share/man/man8/vg*
usr/share/man/man5
+usr/share/man/man8/fsadm.8
+
-Index: LVM2.2.02.95/debian/rules
+Index: new/debian/rules
===================================================================
---- LVM2.2.02.95.orig/debian/rules 2013-03-14 09:50:50.000000000 +0100
-+++ LVM2.2.02.95/debian/rules 2013-03-14 09:57:51.000000000 +0100
-@@ -85,6 +85,7 @@
+--- new.orig/debian/rules 2013-03-03 12:48:24.000000000 +0100
++++ new/debian/rules 2013-03-29 06:57:58.000000000 +0100
+@@ -84,6 +84,7 @@
--with-device-mode=0660 \
--with-default-run-dir=/run/lvm \
--with-default-locking-dir=/run/lock/lvm \
+++ /dev/null
-diff -N -r -u a/debian/clvm.default b/debian/clvm.default
---- a/debian/clvm.default 1970-01-01 01:00:00.000000000 +0100
-+++ b/debian/clvm.default 2013-03-14 09:45:46.000000000 +0100
-@@ -0,0 +1,12 @@
-+# Bourne shell compatible script, sourced by /etc/init.d/clvm to set
-+# additional arguments for clvmd.
-+
-+# enable clmvd
-+#START_CLVM=yes
-+
-+# Startup timeout:
-+#CLVMDTIMEOUT=30
-+
-+# Volume groups to activate on startup:
-+# LVM_VGS="cluster_vg1 cluster_vg2"
-+
-diff -N -r -u a/debian/clvm.examples b/debian/clvm.examples
---- a/debian/clvm.examples 1970-01-01 01:00:00.000000000 +0100
-+++ b/debian/clvm.examples 2013-03-14 09:04:36.000000000 +0100
-@@ -0,0 +1 @@
-+scripts/clvmd_fix_conf.sh
-diff -N -r -u a/debian/clvm.init b/debian/clvm.init
---- a/debian/clvm.init 1970-01-01 01:00:00.000000000 +0100
-+++ b/debian/clvm.init 2013-03-14 09:45:46.000000000 +0100
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+#
-+### BEGIN INIT INFO
-+# Provides: clvm
-+# Required-Start: $remote_fs lvm2 cman
-+# Required-Stop: $remote_fs lvm2 cman
-+# Default-Start: 2 3 4 5
-+# Default-Stop: 0 1 6
-+# Short-Description: start and stop the lvm cluster locking daemon
-+### END INIT INFO
-+#
-+# Author: Frederik Schüler <fs@debian.org>
-+# based on the old clvm init script from etch
-+# and the clvmd init script from RHEL5
-+
-+PATH=/sbin:/usr/sbin:/bin:/usr/bin
-+DESC="Cluster LVM Daemon"
-+NAME=clvm
-+DAEMON=/usr/sbin/clvmd
-+SCRIPTNAME=/etc/init.d/clvm
-+
-+[ -x $DAEMON ] || exit 0
-+
-+. /lib/init/vars.sh
-+
-+. /lib/lsb/init-functions
-+
-+if [ ! -f /etc/cluster/cluster.conf ]; then
-+ log_action_msg "clvmd: cluster not configured"
-+ exit 0
-+fi
-+
-+CLVMDTIMEOUT=30
-+START_CLVM=no
-+
-+# Read configuration variable file if it is present
-+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-+
-+[ "$START_CLVM" = "yes" ] || exit 0
-+
-+DAEMON_OPTS="-T$CLVMDTIMEOUT"
-+
-+if ! cman_tool status >/dev/null 2>&1; then
-+ log_failure_msg "clvmd: cluster is not running. Aborting."
-+ exit 1
-+fi
-+
-+do_start()
-+{
-+ start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS || return $?
-+ # flush cache
-+ vgscan > /dev/null 2>&1
-+ return 0
-+}
-+
-+do_activate()
-+{
-+ if [ -n "$LVM_VGS" ] ; then
-+ log_action_msg "Activating VGs $LVM_VGS"
-+ vgchange -ayl $LVM_VGS || return $?
-+ fi
-+}
-+
-+do_deactivate()
-+{
-+ if [ -n "$LVM_VGS" ] ; then
-+ vgs="$LVM_VGS"
-+ else
-+ # Hack to only deactivate clustered volumes
-+ vgs=$(vgdisplay -C -o vg_name,vg_attr --noheadings 2> /dev/null | awk '($2 ~ /.....c/) {print $1}')
-+ fi
-+
-+ [ "$vgs" ] || return 0
-+
-+ vgchange -anl $vgs || return $?
-+}
-+
-+do_stop()
-+{
-+ start-stop-daemon --stop --quiet --name clvmd
-+ status=$?
-+ return $status
-+}
-+
-+case "$1" in
-+ start)
-+ # start the daemon...
-+ log_daemon_msg "Starting $DESC" "$NAME"
-+ do_start
-+ status=$?
-+ case "$status" in
-+ 0) log_end_msg 0 ;;
-+ 1) log_action_msg " already running" ; log_end_msg 0 ;;
-+ *) log_end_msg 1 ; exit $status ;;
-+ esac
-+ # and activate clustered volume groups
-+ do_activate
-+ status=$?
-+ exit $status
-+ ;;
-+ stop)
-+ pid=$( pidof $DAEMON )
-+ if [ -z "$pid" ] ; then
-+ exit 0
-+ fi
-+ # deactivate volumes...
-+ log_daemon_msg "Deactivating VG $vg:"
-+ do_deactivate
-+ status=$?
-+ case "$status" in
-+ 0) log_end_msg 0 ;;
-+ 1) log_end_msg 0 ;;
-+ *) log_end_msg 1 ;;
-+ esac
-+ # and stop the daemon
-+ log_daemon_msg "Stopping $DESC" "$NAME"
-+ do_stop
-+ status=$?
-+ case "$status" in
-+ 0) log_end_msg 0 ; exit 0 ;;
-+ 1) log_end_msg 0 ; exit 0 ;;
-+ *) log_end_msg 1 ; exit $status ;;
-+ esac
-+ ;;
-+ restart|force-reload)
-+ $0 stop
-+ sleep 1
-+ $0 start
-+ ;;
-+ status)
-+ pid=$( pidof $DAEMON )
-+ if [ -n "$pid" ] ; then
-+ log_action_msg "$DESC is running"
-+ else
-+ log_action_msg "$DESC is not running"
-+ fi
-+ exit 0
-+ ;;
-+ *)
-+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
-+ exit 1
-+ ;;
-+esac
-+
-+exit 0
-diff -N -r -u a/debian/clvm.install b/debian/clvm.install
---- a/debian/clvm.install 1970-01-01 01:00:00.000000000 +0100
-+++ b/debian/clvm.install 2013-03-14 09:04:36.000000000 +0100
-@@ -0,0 +1,2 @@
-+usr/sbin/clvmd
-+usr/share/man/man8/clvmd*
-diff -N -r -u a/debian/clvm.NEWS b/debian/clvm.NEWS
---- a/debian/clvm.NEWS 1970-01-01 01:00:00.000000000 +0100
-+++ b/debian/clvm.NEWS 2013-03-14 09:04:36.000000000 +0100
-@@ -0,0 +1,11 @@
-+lvm2 (2.02.39-4) unstable; urgency=low
-+
-+ The cluster locking support is now built as internal support. This
-+ means that the lvm config needs to contain the following to use this
-+ support.
-+
-+ global {
-+ locking_type = 3
-+ }
-+
-+ -- Bastian Blank <waldi@debian.org> Fri, 21 Nov 2008 15:58:27 +0100
-diff -N -r -u a/debian/clvm.README.Debian b/debian/clvm.README.Debian
---- a/debian/clvm.README.Debian 1970-01-01 01:00:00.000000000 +0100
-+++ b/debian/clvm.README.Debian 2013-03-14 09:04:36.000000000 +0100
-@@ -0,0 +1,23 @@
-+This is the cluster LVM daemon for LVM2.
-+
-+In conjunction with the Red Hat cluster infrastructure (cman & dlm) it
-+will allow LVM volumes on shared storage to be managed from a central
-+point. If you also want to share data you should also look at GFS.
-+
-+Only "normal" block devices may be shared. At present, snapshots and
-+mirroring are not cluster aware. So, if you want to snapshot a volume
-+is is VERY IMPORTANT that not only the snapshot device but also the origin
-+device be activated on one node only.
-+
-+clvmd should be run on all nodes in the cluster, unless this is the case
-+commands will fail as the integrity of the LVM metadata cannot be assured.
-+
-+In order to make normal lvm2 cluster-aware it is necessary to edit the
-+configuration file /etc/lvm/lvm.conf as follows:
-+
-+in the global{} section:
-+ locking_type = 3
-+
-+
-+Patrick Caulfield <patrick@debian.org>
-+24th December 2004
-diff -N -r -u a/debian/control b/debian/control
---- a/debian/control 2013-01-02 11:11:23.000000000 +0100
-+++ b/debian/control 2013-03-14 09:06:33.000000000 +0100
-@@ -35,6 +35,16 @@
- volume groups can be allocated to logical volumes, which are accessed as
- regular block devices.
-
-+Package: clvm
-+Priority: extra
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}, lvm2 (= ${binary:Version}), lsb-base, corosync | cman
-+Description: Cluster LVM Daemon for lvm2
-+ This package provides the clustering interface for lvm2, when used with
-+ Red Hat's "cman" or corosync based (eg Pacemaker) cluster infrastructure.
-+ It allows logical volumes to be created on shared storage devices
-+ (eg Fibre Channel, or iSCSI).
-+
- Package: libdevmapper-dev
- Section: libdevel
- Architecture: any
-@@ -168,3 +178,4 @@
- Description: LVM2 libraries - development files
- This package contains files needed to develop applications that use the
- lvm2app library.
-+
-diff -N -r -u a/debian/rules b/debian/rules
---- a/debian/rules 2013-01-02 11:11:23.000000000 +0100
-+++ b/debian/rules 2013-03-14 09:48:00.000000000 +0100
-@@ -77,7 +77,8 @@
- $(CONFIGURE) \
- --libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --with-optimisation="$(CFLAGS_OPT_DEB)" \
-- --with-cluster=none \
-+ --with-clvmd=cman,corosync \
-+ --with-cluster=internal \
- --with-thin=internal \
- --with-device-uid=0 \
- --with-device-gid=6 \
-@@ -160,6 +161,13 @@
- dh_md5sums
- dh_builddeb $(BUILDDEB_ARGS)
-
-+install_clvm: export DH_OPTIONS = -pclvm
-+install_clvm: DIR = $(BUILD_DIR)/install_deb
-+install_clvm: $(STAMPS_DIR)/install_deb
-+ +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
-+ dh_installinit --no-start -- start 63 2 3 4 5 . start 51 0 1 6 .
-+ +$(MAKE_SELF) install-base
-+
- install_dmeventd: export DH_OPTIONS = -pdmeventd
- install_dmeventd: DIR = $(BUILD_DIR)/install_deb
- install_dmeventd: $(STAMPS_DIR)/install_deb install_liblvm2
-@@ -238,7 +246,7 @@
- +$(MAKE_SELF) install-base
-
- binary-indep:
--binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb)
-+binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-event libdevmapper-dev dmsetup dmsetup-udeb dmeventd liblvm2 lvm2 lvm2-udeb clvm)
-
- binary: binary-indep binary-arch
-
-Index: LVM2.2.02.95/debian/control
+Index: new/debian/control
===================================================================
---- LVM2.2.02.95.orig/debian/control 2013-03-14 09:50:50.000000000 +0100
-+++ LVM2.2.02.95/debian/control 2013-03-14 09:58:41.000000000 +0100
-@@ -20,20 +20,6 @@
+--- new.orig/debian/control 2013-03-29 06:54:51.000000000 +0100
++++ new/debian/control 2013-03-29 06:58:07.000000000 +0100
+@@ -21,20 +21,6 @@
volume groups can be allocated to logical volumes, which are accessed as
regular block devices.
Package: clvm
Priority: extra
Architecture: any
-@@ -79,20 +65,6 @@
+@@ -81,20 +67,6 @@
device-mapper; it allows usage of the device-mapper through a clean,
consistent interface (as opposed to through kernel ioctls).
Package: dmsetup
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux (>> 2.16)
-@@ -101,20 +73,6 @@
+@@ -103,20 +75,6 @@
Description: Linux Kernel Device Mapper userspace library
The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
Team's implementation of a minimalistic kernel-space driver that handles
volume management, while keeping knowledge of the underlying device layout
in user-space. This makes it useful for not only LVM, but EVMS, software
raid, and other drivers that create "virtual" block devices.
-Index: LVM2.2.02.95/debian/rules
+Index: new/debian/rules
===================================================================
---- LVM2.2.02.95.orig/debian/rules 2013-03-14 09:57:51.000000000 +0100
-+++ LVM2.2.02.95/debian/rules 2013-03-14 10:01:13.000000000 +0100
+--- new.orig/debian/rules 2013-03-29 06:57:58.000000000 +0100
++++ new/debian/rules 2013-03-29 06:58:07.000000000 +0100
@@ -66,7 +66,7 @@
cd $(DIR); autoreconf
touch $@
$(STAMPS_DIR)/setup_deb: SOURCE_DIR = $(BUILD_DIR)/source
$(STAMPS_DIR)/setup_deb: DIR = $(BUILD_DIR)/build_deb
-@@ -110,7 +110,7 @@
+@@ -109,7 +109,7 @@
touch $@
build: build-arch build-indep
build-indep:
build_deb: $(STAMPS_DIR)/build_deb
-@@ -247,7 +247,7 @@
+@@ -246,7 +246,7 @@
+$(MAKE_SELF) install-base
binary-indep:
-re-enable-clvm.patch
+#re-enable-clvm.patch
fix-build-dependencies.patch
fix-changelog.patch
fix-fsadm-install.patch
enable-issue-discard.patch
#allow-new-symbols.patch
#fix-udev-rules.patch
+fix-clvm-init.patch
projects / lvm.git / commitdiff