-RELEASE=2.0
+RELEASE=2.1
LVMVERSION=2.02.95
DMVERSION=1.02.74
DEBRELEASE=1
# also update debian changelog patch
-PVERELEASE=${DEBRELEASE}pve1
+PVERELEASE=${DEBRELEASE}pve2
PVEVER=${LVMVERSION}-${PVERELEASE}
DMVER=${DMVERSION}-${PVERELEASE}
Index: LVM2.2.02.95/debian/changelog
===================================================================
--- LVM2.2.02.95.orig/debian/changelog 2011-11-26 18:51:44.000000000 +0100
-+++ LVM2.2.02.95/debian/changelog 2012-04-23 07:54:36.000000000 +0200
-@@ -1,3 +1,35 @@
++++ LVM2.2.02.95/debian/changelog 2012-04-27 07:42:36.000000000 +0200
+@@ -1,3 +1,41 @@
++lvm2 (2.02.95-1pve2) unstable; urgency=low
++
++ * fix udev rule priorities
++
++ -- Proxmox Support Team <support@proxmox.com> Fri, 27 Apr 2012 07:42:26 +0200
++
+lvm2 (2.02.95-1pve1) unstable; urgency=low
+
+ * update to latest available lvm 2.0.95
lvm2 (2.02.88-2) unstable; urgency=low
* Enable corosync and openais support. (closes: #563320)
-@@ -76,7 +108,7 @@
+@@ -76,7 +114,7 @@
* Import upstream version 2.02.72:
- CVE-2010-2526: Fix insecure communication between lvm2 and clvmd.
- Only use single node clvm if explicitly requested.
-- Bastian Blank <waldi@debian.org> Thu, 19 Aug 2010 14:44:02 +0200
-@@ -543,7 +575,7 @@
+@@ -543,7 +581,7 @@
* Don't make /lib/lvm2 the default library directory as it causes initrd
troubles.
Closes: #287042
-- Patrick Caulfield <patrick@debian.org> Fri, 24 Dec 2004 12:27:05 +0000
lvm2 (2.00.31-1) unstable; urgency=low
-@@ -571,7 +603,7 @@
+@@ -571,7 +609,7 @@
* Remove "is not recommended for production use" from package description.
Closes: #278919
* Add lvm2create_initrd to documentation directory.
-- Patrick Caulfield <patrick@debian.org> Wed, 3 Nov 2004 09:37:56 +0000
lvm2 (2.00.24-2) unstable; urgency=low
-@@ -616,7 +648,7 @@
+@@ -616,7 +654,7 @@
Closes: #260700
* Add Czech debconf translation
Closes: #265545
-- Patrick Caulfield <patrick@debian.org> Fri, 20 Aug 2004 10:44:11 +0100
lvm2 (2.00.19-3) unstable; urgency=low
-@@ -756,7 +788,7 @@
+@@ -756,7 +794,7 @@
-- Andres Salomon <dilinger@voxel.net> Thu, 07 Aug 2003 01:04:59 -0400
lvm2 (1.95.15-2) unstable; urgency=low
* Calm-before-the-storm release; the next one will either be 2.00 (once
the kill-yer-VGs bug is fixed) or 1.95 with lvm10 compatibility (once
patrick returns from vacation).
-@@ -832,7 +864,7 @@
+@@ -832,7 +870,7 @@
* Add dmsetup as a suggestion.
* Add /etc/lvm/lvm.conf conffile.
* Add undocumented(7) for the commands missing manpages.
Index: LVM2.2.02.95/debian/dmsetup.install
===================================================================
--- LVM2.2.02.95.orig/debian/dmsetup.install 2010-03-16 20:58:19.000000000 +0100
-+++ LVM2.2.02.95/debian/dmsetup.install 2012-04-23 14:41:42.000000000 +0200
-@@ -1,3 +1,5 @@
++++ LVM2.2.02.95/debian/dmsetup.install 2012-04-27 07:17:20.000000000 +0200
+@@ -1,3 +1,4 @@
-../../tree/dmsetup/* /
-+../../tree/dmsetup/lib/udev/rules.d/60-persistent-storage-dm.rules /lib/udev/rules.d
+../../tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup /usr/share/initramfs-tools/hooks
-+lib/udev/rules.d/
++lib/udev/rules.d
sbin/dmsetup
usr/share/man/man8/dmsetup.8
Index: LVM2.2.02.95/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup
===================================================================
--- LVM2.2.02.95.orig/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup 2009-10-12 04:39:36.000000000 +0200
-+++ LVM2.2.02.95/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup 2012-04-23 14:37:41.000000000 +0200
++++ LVM2.2.02.95/debian/tree/dmsetup/usr/share/initramfs-tools/hooks/dmsetup 2012-04-27 07:17:20.000000000 +0200
@@ -10,7 +10,7 @@
. /usr/share/initramfs-tools/hook-functions
mkdir -p $DESTDIR/lib/udev/rules.d/
-for rules in 55-dm.rules 60-persistent-storage-dm.rules; do
-+for rules in 10-dm.rules 11-dm-lvm 13-dm-disk.rules 60-persistent-storage-dm.rules 95-dm-notify.rules; do
++for rules in 55-dm.rules 56-dm-lvm 58-dm-disk.rules 60-persistent-storage-dm.rules 95-dm-notify.rules; do
if [ -e /etc/udev/rules.d/$rules ]; then
cp -p /etc/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/
elif [ -e /lib/udev/rules.d/$rules ]; then
+Index: LVM2.2.02.95/debian/rules
+===================================================================
+--- LVM2.2.02.95.orig/debian/rules 2012-04-27 07:17:46.000000000 +0200
++++ LVM2.2.02.95/debian/rules 2012-04-27 07:18:10.000000000 +0200
+@@ -163,7 +163,11 @@
+
+ install_dmsetup: export DH_OPTIONS = -pdmsetup
+ install_dmsetup: DIR = $(BUILD_DIR)/install_deb
++install_dmsetup: UDEVDIR = $(BUILD_DIR)/install_deb/lib/udev/rules.d
+ install_dmsetup: $(STAMPS_DIR)/install_deb
++ mv $(UDEVDIR)/10-dm.rules $(UDEVDIR)/55-dm.rules
++ mv $(UDEVDIR)/11-dm-lvm.rules $(UDEVDIR)/56-dm-lvm.rules
++ mv $(UDEVDIR)/13-dm-disk.rules $(UDEVDIR)/58-dm-disk.rules
+ +$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+ +$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+
projects / lvm.git / commitdiff