[multipath] resurect the rules file

I overlooked the fact we still need the rules file to handle the
partitions through kpartx.

So revert 3872743f0b2479b0450368e56a664583821bc5a3, but remove the
multipath(8) trigger from the rules file.

diff --git a/multipath-tools.spec.in b/multipath-tools.spec.in
index bd33e67..ebf41b9 100644 (file)
--- a/multipath-tools.spec.in
+++ b/multipath-tools.spec.in
@@ -55,6 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/usr/share/man/man8/mpath_prio_alua.8.gz
 %{prefix}/usr/share/man/man8/multipathd.8.gz
 %{prefix}/usr/bin/multipathd
+%{prefix}/etc/udev/rules.d/multipath.rules
 
 
 %changelog

diff --git a/multipath/Makefile b/multipath/Makefile
index a3aa25e..b0310a3 100644 (file)
--- a/multipath/Makefile
+++ b/multipath/Makefile
@@ -41,10 +41,13 @@ $(MULTIPATHLIB)-$(BUILD).a:
 install:
        install -d $(DESTDIR)$(bindir)
        install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+       install -d $(DESTDIR)/etc/udev/rules.d
+       install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
        install -d $(DESTDIR)$(mandir)
        install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
 
 uninstall:
+       rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
        rm $(DESTDIR)$(bindir)/$(EXEC)
        rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
 

diff --git a/multipath/multipath.rules b/multipath/multipath.rules
index cce4064..10751ce 100644 (file)
--- a/multipath/multipath.rules
+++ b/multipath/multipath.rules
@@ -16,7 +16,3 @@ ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
 ACTION=="add", SUBSYSTEM=="block", KERNEL=="dm-*", \
        RUN+="/sbin/kpartx -a /dev/mapper/%c"
 
-# insert new paths in multipath topology
-ACTION=="add", SUBSYSTEM=="block", KERNEL!="dm-*", \
-       RUN+="/sbin/multipath -v0 %r/%k"
-