From 13cdeb27621a676f1946182ca3805a626c1fb00a Mon Sep 17 00:00:00 2001
From: Peter Rajnoha <prajnoha@redhat.com>
Date: Tue, 24 Sep 2013 09:57:16 +0200
Subject: [PATCH] A few more edits for lvm2 v2.02.102.

---
 lvm2-enable-lvmetad-by-default.patch | 12 ++++++------
 lvm2.spec                            |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lvm2-enable-lvmetad-by-default.patch b/lvm2-enable-lvmetad-by-default.patch
index a0e0ad8..c128be8 100644
--- a/lvm2-enable-lvmetad-by-default.patch
+++ b/lvm2-enable-lvmetad-by-default.patch
@@ -3,20 +3,20 @@
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/conf/example.conf.in b/conf/example.conf.in
-index 2032a81..0997aa4 100644
+index fb96079..962680b 100644
 --- a/conf/example.conf.in
 +++ b/conf/example.conf.in
-@@ -550,7 +550,7 @@ global {
-     #
-     # If lvmetad has been running while use_lvmetad was 0, it MUST be stopped
-     # before changing use_lvmetad to 1 and started again afterwards.
+@@ -571,7 +571,7 @@ global {
+     # setting itself.
+     # To prevent scanning devices completely, even when using lvmetad,
+     # the devices/global_filter must be used.
 -    use_lvmetad = 0
 +    use_lvmetad = 1
  
      # Full path of the utility called to check that a thin metadata device
      # is in a state that allows it to be used.
 diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
-index 16a9437..17f43c6 100644
+index 3549b6d..e1b096b 100644
 --- a/lib/config/config_settings.h
 +++ b/lib/config/config_settings.h
 @@ -156,7 +156,7 @@ cfg(global_metadata_read_only_CFG, "metadata_read_only", global_CFG_SECTION, 0,
diff --git a/lvm2.spec b/lvm2.spec
index 61c5422..8d4ff02 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -12,7 +12,7 @@
 %define corosync_version 1.99.9-1
 %define dlm_version 3.99.1-1
 %define libselinux_version 1.30.19-4
-%define persistent_data_version 0.2.3-1
+%define persistent_data_version 0.2.7-1
 
 %if 0%{?rhel}
   %ifnarch i686 x86_64
@@ -44,6 +44,7 @@ URL: http://sources.redhat.com/lvm2
 Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
 Patch0: lvm2-set-default-preferred_names.patch
 Patch1: lvm2-enable-lvmetad-by-default.patch
+Patch2: lvm2-2_02_103-do-not-install-separate-command-symlink-for-lvm-devtypes.patch
 
 BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel
 BuildRequires: ncurses-devel
@@ -80,7 +81,7 @@ or more physical volumes and creating one or more logical volumes
 %setup -q -n LVM2.%{version}
 %patch0 -p1 -b .preferred_names
 %patch1 -p1 -b .enable_lvmetad
-%patch2 -p1 -b .lvmetad_mda_overflow
+%patch2 -p1 -b .lvm_devtypes
 
 %build
 %define _default_pid_dir /run