From 212398378e94847fee5d2b56dbebdae9fc55bb77a50b8fc3467c69faf08a896c Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.com>
Date: Wed, 30 May 2012 15:19:16 +0000
Subject: [PATCH] Checked in from git branch opensuse-12.2

OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=30
---
 multipath-tools-0.4.9-opensuse-12.2.diff.bz2 | 4 ++--
 multipath-tools.spec                         | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/multipath-tools-0.4.9-opensuse-12.2.diff.bz2 b/multipath-tools-0.4.9-opensuse-12.2.diff.bz2
index 2027ca4..64a781e 100644
--- a/multipath-tools-0.4.9-opensuse-12.2.diff.bz2
+++ b/multipath-tools-0.4.9-opensuse-12.2.diff.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7c64a22c5276870a9c491b7475c1ad135c6eaa94958d3fcc20d28ca4d96184d
-size 111325
+oid sha256:3cd90ece4687e2415fef776b17bf4f86a8dabd7e8456238cf359eb18e2fc4357
+size 111240
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 633aa3a..0c3695f 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -79,6 +79,8 @@ make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib
 %install
 make DESTDIR=$RPM_BUILD_ROOT LIB=%_lib install
 mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
+rm /usr/include/mpath_persist.h
+rm /%_lib/libmpathpersist.so
 
 %clean
 [ "$RPM_BUILD_ROOT" != / ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
@@ -139,6 +141,10 @@ fi
 %dir /lib/mkinitrd/scripts
 /lib/mkinitrd/scripts/boot-multipath.sh
 /lib/mkinitrd/scripts/setup-multipath.sh
+/lib/mkinitrd/scripts/boot-multipathd.sh
+/lib/mkinitrd/scripts/boot-killmultipathd.sh
+%dir /lib/systemd/system
+/lib/systemd/system/multipathd.service
 %{_mandir}/man8/multipath.8*
 %{_mandir}/man5/multipath.conf.5*
 %{_mandir}/man8/multipathd.8*
@@ -149,7 +155,6 @@ fi
 %dir /etc/udev/rules.d
 %config /etc/udev/rules.d/70-kpartx.rules
 /sbin/kpartx
-/sbin/activate_dm_linear
 %dir /lib/udev
 /lib/udev/kpartx_id
 %dir /lib/mkinitrd