| From 9a941729d3c0d19d30d65e16b291c380e589eeb3 Mon Sep 17 00:00:00 2001 |
| From: Benjamin Marzinski <bmarzins@redhat.com> |
| Date: Thu, 13 Apr 2017 07:22:23 -0500 |
| Subject: [PATCH] RH: fixup udev rules for redhat |
| |
| The multipath rules need to run after scsi_id is run. This means moving |
| them after 60-persistent-storage.rules for redhat. Redhat also uses a |
| different naming scheme for partitions than SuSE. Also, there are some |
| false warnings that gcc throws because of the changed options. Fix these |
| too. |
| |
| Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> |
| |
| Update patch to 0.8.0 |
| |
| Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| [OP: Rebase to 0.9.3] |
| Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
| --- |
| Upstream-Status: Pending |
| |
| Makefile.inc | 2 +- |
| kpartx/kpartx.rules | 2 +- |
| multipath/Makefile | 4 ++-- |
| 3 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/Makefile.inc b/Makefile.inc |
| index 4d843ce5..57779fd8 100644 |
| --- a/Makefile.inc |
| +++ b/Makefile.inc |
| @@ -81,7 +81,7 @@ endif |
| prefix = |
| exec_prefix = $(prefix) |
| usr_prefix = $(prefix) |
| -bindir = $(exec_prefix)/sbin |
| +bindir = $(exec_prefix)/usr/sbin |
| libudevdir = $(prefix)/$(SYSTEMDPATH)/udev |
| tmpfilesdir = $(prefix)/$(SYSTEMDPATH)/tmpfiles.d |
| udevrulesdir = $(libudevdir)/rules.d |
| diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules |
| index 1969dee0..d2b28233 100644 |
| --- a/kpartx/kpartx.rules |
| +++ b/kpartx/kpartx.rules |
| @@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end" |
| GOTO="kpartx_end" |
| |
| LABEL="run_kpartx" |
| -RUN+="/sbin/kpartx -un -p -part /dev/$name" |
| +RUN+="/sbin/kpartx -un /dev/$name" |
| |
| LABEL="kpartx_end" |
| diff --git a/multipath/Makefile b/multipath/Makefile |
| index 116348e2..8482de6a 100644 |
| --- a/multipath/Makefile |
| +++ b/multipath/Makefile |
| @@ -23,7 +23,7 @@ install: |
| $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ |
| $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) |
| $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) |
| - $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules |
| + $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules |
| $(INSTALL_PROGRAM) -d $(DESTDIR)$(modulesloaddir) |
| $(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf |
| $(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir) |
| @@ -43,7 +43,7 @@ uninstall: |
| $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules |
| $(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf |
| $(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf |
| - $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules |
| + $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules |
| $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8 |
| $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5 |
| |
| -- |
| 2.38.1 |
| |