enable issue_discard in default lvm.conf

diff --git a/Makefile b/Makefile
index 70f979de1b8828901b8aaccaf1c15530fc2eea4a..5c7df95e53eda1ae0456f3365818743e12b2d9b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ LVMVERSION=2.02.88
 DMVERSION=1.02.67
 DEBRELEASE=2
 # also update debian changelog patch
-PVERELEASE=${DEBRELEASE}pve1
+PVERELEASE=${DEBRELEASE}pve2
 PVEVER=${LVMVERSION}-${PVERELEASE}
 DMVER=${DMVERSION}-${PVERELEASE}
 

diff --git a/patchdir/enable-issue-discard.patch b/patchdir/enable-issue-discard.patch
new file mode 100644 (file)
index 0000000..2c1f0cc
--- /dev/null
+++ b/patchdir/enable-issue-discard.patch
@@ -0,0 +1,13 @@
+Index: lvm2-2.02.88/doc/example.conf.in
+===================================================================
+--- lvm2-2.02.88.orig/doc/example.conf.in      2012-03-09 09:53:24.000000000 +0100
++++ lvm2-2.02.88/doc/example.conf.in   2012-03-09 09:53:30.000000000 +0100
+@@ -178,7 +178,7 @@
+     # to 1, discards will only be issued if both the storage and kernel provide
+     # support.
+     # 1 enables; 0 disables.
+-    issue_discards = 0
++    issue_discards = 1
+ }
+ 
+ # This section allows you to configure the way in which LVM selects

diff --git a/patchdir/fix-changelog.patch b/patchdir/fix-changelog.patch
index 859d3929fd411371633955be6b3c375a2f894e9f..fd29d88e4b0bba2602e956db5db4580a37619cd5 100644 (file)
--- a/patchdir/fix-changelog.patch
+++ b/patchdir/fix-changelog.patch
@@ -1,8 +1,14 @@
-Index: new/debian/changelog
+Index: lvm2-2.02.88/debian/changelog
 ===================================================================
---- new.orig/debian/changelog  2011-12-09 06:48:43.000000000 +0100
-+++ new/debian/changelog       2011-12-09 06:51:08.000000000 +0100
-@@ -1,3 +1,23 @@
+--- lvm2-2.02.88.orig/debian/changelog 2011-11-26 18:51:44.000000000 +0100
++++ lvm2-2.02.88/debian/changelog      2012-03-09 09:56:19.000000000 +0100
+@@ -1,3 +1,29 @@
++lvm2 (2.02.88-2pve2) unstable; urgency=low
++
++  * enable issue_discard in default lvm.conf
++
++ -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Mar 2012 09:56:19 +0100
++
 +lvm2 (2.02.88-2pve1) unstable; urgency=low
 +
 +  * update to 2.02.88-2
@@ -26,7 +32,7 @@ Index: new/debian/changelog
  lvm2 (2.02.88-2) unstable; urgency=low
  
    * Enable corosync and openais support. (closes: #563320)
-@@ -76,7 +96,7 @@
+@@ -76,7 +102,7 @@
  
    * Import upstream version 2.02.72:
      - CVE-2010-2526: Fix insecure communication between lvm2 and clvmd.
@@ -35,7 +41,7 @@ Index: new/debian/changelog
      - Only use single node clvm if explicitly requested.
  
   -- Bastian Blank <waldi@debian.org>  Thu, 19 Aug 2010 14:44:02 +0200
-@@ -543,7 +563,7 @@
+@@ -543,7 +569,7 @@
    * Don't make /lib/lvm2 the default library directory as it causes initrd
      troubles.
      Closes: #287042
@@ -44,7 +50,7 @@ Index: new/debian/changelog
   -- Patrick Caulfield <patrick@debian.org>  Fri, 24 Dec 2004 12:27:05 +0000
  
  lvm2 (2.00.31-1) unstable; urgency=low
-@@ -571,7 +591,7 @@
+@@ -571,7 +597,7 @@
    * Remove "is not recommended for production use" from package description.
      Closes: #278919
    * Add lvm2create_initrd to documentation directory.
@@ -53,7 +59,7 @@ Index: new/debian/changelog
   -- Patrick Caulfield <patrick@debian.org>  Wed,  3 Nov 2004 09:37:56 +0000
  
  lvm2 (2.00.24-2) unstable; urgency=low
-@@ -616,7 +636,7 @@
+@@ -616,7 +642,7 @@
      Closes: #260700
    * Add Czech debconf translation
      Closes: #265545
@@ -62,7 +68,7 @@ Index: new/debian/changelog
   -- Patrick Caulfield <patrick@debian.org>  Fri, 20 Aug 2004 10:44:11 +0100
  
  lvm2 (2.00.19-3) unstable; urgency=low
-@@ -756,7 +776,7 @@
+@@ -756,7 +782,7 @@
   -- Andres Salomon <dilinger@voxel.net>  Thu, 07 Aug 2003 01:04:59 -0400
  
  lvm2 (1.95.15-2) unstable; urgency=low
@@ -71,7 +77,7 @@ Index: new/debian/changelog
    * 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 +852,7 @@
+@@ -832,7 +858,7 @@
    * Add dmsetup as a suggestion.
    * Add /etc/lvm/lvm.conf conffile.
    * Add undocumented(7) for the commands missing manpages.

diff --git a/patchdir/series b/patchdir/series
index 754efc1a764f0c8548447c44458093885f9951e7..2f960c1a59542ed2b4832ab13f1e4300f6191e3b 100644 (file)
--- a/patchdir/series
+++ b/patchdir/series
@@ -8,3 +8,4 @@ remove-udebs.patch
 fix-lvm2-init-script-patch
 fix-libdevmapper-priority.patch
 remove-openais-clvm.patch
+enable-issue-discard.patch