mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-16 23:02:33 +00:00
c5560026f6
Dropped 0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch and 0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch which are now merged in the upstream. Refreshed other patches for the new version. Release Note: https://github.com/opensvc/multipath-tools/blob/0.11.3/NEWS.md Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
77 lines
3.0 KiB
Diff
77 lines
3.0 KiB
Diff
From 9fb89db1bb09efc5b31a140c26d540072083c5e5 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>
|
|
|
|
[OP: Rebase to 0.9.3]
|
|
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
|
|
|
|
Rebase to 0.9.8
|
|
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Rebase to 0.10.0
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
---
|
|
Makefile.inc | 2 +-
|
|
kpartx/kpartx.rules.in | 2 +-
|
|
multipath/Makefile | 4 ++--
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Makefile.inc b/Makefile.inc
|
|
index 65f6efc8..596e68c0 100644
|
|
--- a/Makefile.inc
|
|
+++ b/Makefile.inc
|
|
@@ -62,7 +62,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d
|
|
modulesloaddir := $(systemd_prefix)lib/modules-load.d
|
|
libudevdir := $(systemd_prefix)lib/udev
|
|
udevrulesdir := $(libudevdir)/rules.d
|
|
-bindir := $(exec_prefix)sbin
|
|
+bindir := $(exec_prefix)/usr/sbin
|
|
mandir := $(usr_prefix)share/man
|
|
LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib)
|
|
syslibdir := $(prefix)$(LIB)
|
|
diff --git a/kpartx/kpartx.rules.in b/kpartx/kpartx.rules.in
|
|
index 9d879609..2049eb8f 100644
|
|
--- a/kpartx/kpartx.rules.in
|
|
+++ b/kpartx/kpartx.rules.in
|
|
@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
|
|
GOTO="kpartx_end"
|
|
|
|
LABEL="run_kpartx"
|
|
-RUN+="@BINDIR@/kpartx -un -p -part /dev/$name"
|
|
+RUN+="@BINDIR@/kpartx -un /dev/$name"
|
|
|
|
LABEL="kpartx_end"
|
|
diff --git a/multipath/Makefile b/multipath/Makefile
|
|
index 67fb5e62..2ea9e528 100644
|
|
--- a/multipath/Makefile
|
|
+++ b/multipath/Makefile
|
|
@@ -27,7 +27,7 @@ install:
|
|
$(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)
|
|
$(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
|
|
$(Q)$(INSTALL_PROGRAM) -m 644 99-z-dm-mpath-late.rules $(DESTDIR)$(udevrulesdir)
|
|
- $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules
|
|
+ $(Q)$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules
|
|
$(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir)
|
|
$(Q)$(INSTALL_PROGRAM) -m 644 tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/multipath.conf
|
|
$(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)/man8
|
|
@@ -50,7 +50,7 @@ uninstall:
|
|
$(Q)$(RM) $(DESTDIR)$(udevrulesdir)/99-z-dm-mpath-late.rules
|
|
$(Q)$(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf
|
|
$(Q)$(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf
|
|
- $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
|
|
+ $(Q)$(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
|
|
$(Q)$(RM) $(DESTDIR)$(mandir)/man8/$(EXEC).8
|
|
$(Q)$(RM) $(DESTDIR)$(mandir)/man5/$(EXEC).conf.5
|
|
$(Q)$(RM) $(DESTDIR)$(tmpfilesdir)/multipath.conf
|