1From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 2From: Benjamin Marzinski <bmarzins@redhat.com> 3Date: Thu, 13 Apr 2017 07:22:23 -0500 4Subject: [PATCH] RH: fixup udev rules for redhat 5 6The multipath rules need to run after scsi_id is run. This means moving 7them after 60-persistent-storage.rules for redhat. Redhat also uses a 8different naming scheme for partitions than SuSE. Also, there are some 9false warnings that gcc throws because of the changed options. Fix these 10too. 11 12Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> 13 14Update patch to 0.8.0 15 16Signed-off-by: Changqing Li <changqing.li@windriver.com> 17--- 18 Makefile.inc | 2 +- 19 kpartx/kpartx.rules | 2 +- 20 multipath/Makefile | 4 ++-- 21 3 files changed, 4 insertions(+), 4 deletions(-) 22 23diff --git a/Makefile.inc b/Makefile.inc 24index fc728ca..2f0bcea 100644 25--- a/Makefile.inc 26+++ b/Makefile.inc 27@@ -48,7 +48,7 @@ endif 28 prefix = 29 exec_prefix = $(prefix) 30 usr_prefix = $(prefix) 31-bindir = $(exec_prefix)/sbin 32+bindir = $(exec_prefix)/usr/sbin 33 libudevdir = $(prefix)/$(SYSTEMDPATH)/udev 34 udevrulesdir = $(libudevdir)/rules.d 35 multipathdir = $(TOPDIR)/libmultipath 36diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules 37index 8f99049..8a3a171 100644 38--- a/kpartx/kpartx.rules 39+++ b/kpartx/kpartx.rules 40@@ -32,6 +32,6 @@ LABEL="mpath_kpartx_end" 41 GOTO="kpartx_end" 42 43 LABEL="run_kpartx" 44-RUN+="/sbin/kpartx -un -p -part /dev/$name" 45+RUN+="/sbin/kpartx -un /dev/$name" 46 47 LABEL="kpartx_end" 48diff --git a/multipath/Makefile b/multipath/Makefile 49index 0828a8f..b9bbb3c 100644 50--- a/multipath/Makefile 51+++ b/multipath/Makefile 52@@ -24,7 +24,7 @@ install: 53 $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ 54 $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) 55 $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) 56- $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules 57+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules 58 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir) 59 $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir) 60 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) 61@@ -33,7 +33,7 @@ install: 62 uninstall: 63 $(RM) $(DESTDIR)$(bindir)/$(EXEC) 64 $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules 65- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules 66+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules 67 $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz 68 $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz 69 70-- 712.7.4 72 73