From 8795157d368c35690b273e69acf597ea1c0785c2 Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Tue, 9 Dec 2014 19:31:49 -0600
Subject: device-mapper-multipath-0.4.9-70

Add 0102-RHBZ-1160478-mpathconf-template.patch
  * mpathconf no longer copies the default config template for the
    docs directory.  It simply writes the template itself.
Resolves: bz# 1160478
---
 0102-RHBZ-1160478-mpathconf-template.patch | 52 ++++++++++++++++++++++++++++++
 device-mapper-multipath.spec               | 10 +++++-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 0102-RHBZ-1160478-mpathconf-template.patch

diff --git a/0102-RHBZ-1160478-mpathconf-template.patch b/0102-RHBZ-1160478-mpathconf-template.patch
new file mode 100644
index 0000000..3c0e443
--- /dev/null
+++ b/0102-RHBZ-1160478-mpathconf-template.patch
@@ -0,0 +1,52 @@
+---
+ multipath/mpathconf |   26 ++++++++++++++++++++------
+ 1 file changed, 20 insertions(+), 6 deletions(-)
+
+Index: multipath-tools-130222/multipath/mpathconf
+===================================================================
+--- multipath-tools-130222.orig/multipath/mpathconf
++++ multipath-tools-130222/multipath/mpathconf
+@@ -19,10 +19,27 @@
+ 
+ unset ENABLE FIND FRIENDLY MODULE MULTIPATHD HAVE_DISABLE HAVE_FIND HAVE_BLACKLIST HAVE_DEFAULTS HAVE_FRIENDLY HAVE_MULTIPATHD HAVE_MODULE SHOW_STATUS CHANGED_CONFIG
+ 
+-DEFAULT_CONFIGFILE="/usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf"
++DEFAULT_CONFIG="# device-mapper-multipath configuration file
++
++# For a complete list of the default configuration values, run either:
++# # multipath -t
++# or
++# # multipathd show config
++
++# For a list of configuration options with descriptions, see the
++# multipath.conf man page.
++
++# For an example configuration file, see:
++# /user/share/doc/device-mapper-multipath/multipath.conf
++
++defaults {
++	user_friendly_names yes
++	find_multipaths yes
++}"
++
+ CONFIGFILE="/etc/multipath.conf"
+ MULTIPATHDIR="/etc/multipath"
+-TMPFILE=/etc/multipath/.multipath.conf.tmp
++TMPFILE="/etc/multipath/.multipath.conf.tmp"
+ 
+ function usage
+ {
+@@ -134,12 +151,9 @@ if [ ! -d "$MULTIPATHDIR" ]; then
+ fi
+ 
+ rm $TMPFILE 2> /dev/null
++echo "$DEFAULT_CONFIG" > $TMPFILE
+ if [ -f "$CONFIGFILE" ]; then
+ 	cp $CONFIGFILE $TMPFILE
+-elif [ -f "$DEFAULT_CONFIGFILE" ]; then
+-	cp $DEFAULT_CONFIGFILE $TMPFILE
+-else
+-	touch $TMPFILE
+ fi
+ 
+ if grep -q "^blacklist[[:space:]]*{" $TMPFILE ; then
diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 7501468..657bd00 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.9
-Release: 69%{?dist}
+Release: 70%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -109,6 +109,7 @@ Patch0098: 0098-UPBZ-1067171-mutipath-i.patch
 Patch0099: 0099-RH-add-all-devs.patch
 Patch0100: 0100-RHBZ-1067171-multipath-i-update.patch
 Patch0101: 0101-RH-adapter-name-wildcard.patch
+Patch0102: 0102-RHBZ-1160478-mpathconf-template.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -261,6 +262,7 @@ kpartx manages partition creation and removal for device-mapper devices.
 %patch0099 -p1
 %patch0100 -p1
 %patch0101 -p1
+%patch0102 -p1
 cp %{SOURCE1} .
 
 %build
@@ -359,6 +361,12 @@ bin/systemctl --no-reload enable multipathd.service >/dev/null 2>&1 ||:
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Tue Dec  9 2014 Benjamin Marzinski <bmarzins@redhat.com> 0.4.9-70
+- Add 0102-RHBZ-1160478-mpathconf-template.patch
+  * mpathconf no longer copies the default config template for the
+    docs directory.  It simply writes the template itself.
+- Resolves: bz# 1160478
+
 * Thu Nov 13 2014 Benjmain Marzinski <bmarzins@redhat.com> 0.4.9-69
 - Rebuild
 
-- 
cgit