From ba2af419284081bd5a58ea3ba1a2ac7656a82353 Mon Sep 17 00:00:00 2001
From: Marian Csontos <mcsontos@redhat.com>
Date: Wed, 17 May 2017 17:07:19 +0200
Subject: [PATCH] Add patch for lvmdbusd

---
 ... => lvm2-2_02_172-lvmdbusd-fix-pv-lookup.patch |  0
 lvm2-2_02_172-lvmdbusd-mangling-config.patch      | 15 +++++++++++++++
 lvm2.spec                                         | 10 ++++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)
 rename lvm2-2_02_171-lvmdbusd-fix-pv-lookup.patch => lvm2-2_02_172-lvmdbusd-fix-pv-lookup.patch (100%)
 create mode 100644 lvm2-2_02_172-lvmdbusd-mangling-config.patch

diff --git a/lvm2-2_02_171-lvmdbusd-fix-pv-lookup.patch b/lvm2-2_02_172-lvmdbusd-fix-pv-lookup.patch
similarity index 100%
rename from lvm2-2_02_171-lvmdbusd-fix-pv-lookup.patch
rename to lvm2-2_02_172-lvmdbusd-fix-pv-lookup.patch
diff --git a/lvm2-2_02_172-lvmdbusd-mangling-config.patch b/lvm2-2_02_172-lvmdbusd-mangling-config.patch
new file mode 100644
index 0000000..3997371
--- /dev/null
+++ b/lvm2-2_02_172-lvmdbusd-mangling-config.patch
@@ -0,0 +1,15 @@
+diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py
+index af9e10a..170824d 100644
+--- a/daemons/lvmdbusd/utils.py
++++ b/daemons/lvmdbusd/utils.py
+@@ -519,7 +519,9 @@ def add_no_notify(cmdline):
+ 		if '--config' in cmdline:
+ 			for i, arg in enumerate(cmdline):
+ 				if arg == '--config':
+-					cmdline[i] += "global/notify_dbus=0"
++					if len(cmdline) <= i+1:
++						raise dbus.exceptions.DBusException("Missing value for --config option.")
++					cmdline[i+1] += " global/notify_dbus=0"
+ 					break
+ 		else:
+ 			cmdline.extend(['--config', 'global/notify_dbus=0'])
diff --git a/lvm2.spec b/lvm2.spec
index 42787e0..783bc60 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -54,7 +54,7 @@ Summary: Userland logical volume management tools
 Name: lvm2
 
 Version: 2.02.171
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -62,7 +62,9 @@ Source0: ftp://sources.redhat.com/pub/lvm2/releases/LVM2.%{version}.tgz
 Patch0: lvm2-set-default-preferred_names.patch
 Patch1: lvm2-lvmetad-timeout.patch
 # Commit 405a3689bcc4 related to RHBZ#1445302
-Patch2: lvm2-2_02_171-lvmdbusd-fix-pv-lookup.patch
+Patch2: lvm2-2_02_172-lvmdbusd-fix-pv-lookup.patch
+# Commit 16c6d9f11ab5 fixing RHBZ#1451612
+Patch3: lvm2-2_02_172-lvmdbusd-mangling-config.patch
 
 BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel
 BuildRequires: libblkid-devel >= %{util_linux_version}
@@ -119,6 +121,7 @@ or more physical volumes and creating one or more logical volumes
 %patch0 -p1 -b .preferred_names
 %patch1 -p1 -b .lvmetad_timeout
 %patch2 -p1 -b .lvmdbusd_lookup
+%patch3 -p1 -b .lvmdbusd_config_mangling
 
 %build
 %global _default_pid_dir /run
@@ -851,6 +854,9 @@ the device-mapper event library.
 %{_libdir}/pkgconfig/devmapper-event.pc
 
 %changelog
+* Wed May 17 2017 Marian Csontos <mcsontos@redhat.com> - 2.02.171-2
+- Fix lvmdbusd mangling config options.
+
 * Tue May 09 2017 Marian Csontos <mcsontos@redhat.com> - 2.02.171-1
 - Add RAID takeover and reshaping.
 - Add pvcreate prompt when device size doesn't match setphysicalvolumesize.