Merge lp:~brightbox/ubuntu/raring/lvm2/fix-for-1075994 into lp:ubuntu/raring/lvm2

[Neil Wilson]

Now that the Xmas time-sink is out of the way I've retargeted this patch to the raring branch of lvm2 following the process at http://developer.ubuntu.com/packaging/html/fixing-a-bug.html

The patch has the correct DEP3 headers in now.

[Dimitri John Ledkov (xnox)]

The patch does not have the correct DEP3 headers, as they should not start with "##".
Let me review your thin-provisioning packaging first, before merging this.

[lp:~brightbox/ubuntu/raring/lvm2/fix-for-1075994]

75. By Neil Wilson on 2013-01-10

Remove unnecessary ## from patch header

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-09 15:31:14 +0000
+++ debian/changelog	2013-01-10 19:36:20 +0000
@@ -1,9 +1,21 @@
+<<<<<<< TREE
 lvm2 (2.02.95-5ubuntu2) UNRELEASED; urgency=low
 
   * Use upstream dmeventd.8 manpage (LP: #1076304) 
 
  -- Neil Wilson <[e-mail]>  Wed, 09 Jan 2013 15:28:11 +0000
 
+=======
+lvm2 (2.02.95-5ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/1075994_move_thin_check_executable_to_proper_section.
+    patch:
+    - put thin_check_executable in the 'global' section
+    - look for thin_check in /usr/sbin (LP: #1075994)
+
+ -- Neil Wilson <[e-mail]>  Wed, 09 Jan 2013 14:36:04 +0000
+
+>>>>>>> MERGE-SOURCE
 lvm2 (2.02.95-5ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable, remaining changes (LP: #1082325):

=== added file 'debian/patches/1075994_move_thin_check_executable_to_proper_section.patch'
--- debian/patches/1075994_move_thin_check_executable_to_proper_section.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/1075994_move_thin_check_executable_to_proper_section.patch	2013-01-10 19:36:20 +0000
@@ -0,0 +1,39 @@
+Description: Move thin_check_executable to proper section
+Origin: upstream, http://git.fedorahosted.org/cgit/lvm2.git/commit/?id=8db4540263f607e2113a405953000527ffd34b3c
+Bug-Ubuntu: https://launchpad.net/bugs/1075994
+--- a/doc/example.conf.in
++++ b/doc/example.conf.in
+@@ -463,6 +463,16 @@
+     # proper udev rules, all changes in block device configuration will be
+     # *ignored* until a manual 'vgscan' is performed.
+     use_lvmetad = 0
++
++    # Full path of the utility called to check that a thin metadata device
++    # is in a state that allows it to be used.
++    # Each time a thin pool needs to be activated, this utility is executed.
++    # The activation will only proceed if the utility has an exit status of 0.
++    # Set to "" to skip this check.  (Not recommended.)
++    # The thin tools are available as part of the device-mapper-persistent-data
++    # package from https://github.com/jthornber/thin-provisioning-tools.
++    #
++    thin_check_executable = "/usr/sbin/thin_check -q"
+ }
+ 
+ activation {
+@@ -650,16 +660,6 @@
+     thin_pool_autoextend_threshold = 100
+     thin_pool_autoextend_percent = 20
+ 
+-    # Full path of the utility called to check that a thin metadata device
+-    # is in a state that allows it to be used.
+-    # Each time a thin pool needs to be activated, this utility is executed.
+-    # The activation will only proceed if the utility has an exit status of 0.
+-    # Set to "" to skip this check.  (Not recommended.)
+-    # The thin tools are available as part of the device-mapper-persistent-data
+-    # package from https://github.com/jthornber/thin-provisioning-tools.
+-    #
+-    thin_check_executable = "/sbin/thin_check -q"
+-
+     # While activating devices, I/O to devices being (re)configured is
+     # suspended, and as a precaution against deadlocks, LVM2 needs to pin
+     # any memory it is using so it is not paged out.  Groups of pages that

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-26 10:35:00 +0000
+++ debian/patches/series	2013-01-10 19:36:20 +0000
@@ -11,3 +11,4 @@
 upstream-fix-discard-2.patch
 upstream-fix-discard-3.patch
 missing-dmeventd.patch
+1075994_move_thin_check_executable_to_proper_section.patch