Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 79cfa849badfe790acf152757b015db22c0e9800 / . / meta-openembedded / meta-oe / recipes-support / multipath-tools / files / 0021-RH-fixup-udev-rules-for-redhat.patch
blob: 395f9a9b0300103b54cae064e098e45841eb9fef [file] [log] [blame]
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]1From 9a941729d3c0d19d30d65e16b291c380e589eeb3 Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]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>
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]13
14Update patch to 0.8.0
15
16Signed-off-by: Changqing Li <changqing.li@windriver.com>
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]17[OP: Rebase to 0.9.3]
18Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]19---
Patrick Williams520786c2023-06-25 16:20:36 -0500[diff] [blame]20Upstream-Status: Pending
21
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]22 Makefile.inc | 2 +-
23 kpartx/kpartx.rules | 2 +-
24 multipath/Makefile | 4 ++--
Brad Bishop19323692019-04-05 15:28:33 -0400[diff] [blame]25 3 files changed, 4 insertions(+), 4 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]26
27diff --git a/Makefile.inc b/Makefile.inc
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]28index 4d843ce5..57779fd8 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]29--- a/Makefile.inc
30+++ b/Makefile.inc
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]31@@ -81,7 +81,7 @@ endif
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]32 prefix =
33 exec_prefix = $(prefix)
34 usr_prefix = $(prefix)
35-bindir = $(exec_prefix)/sbin
36+bindir = $(exec_prefix)/usr/sbin
37 libudevdir = $(prefix)/$(SYSTEMDPATH)/udev
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]38 tmpfilesdir = $(prefix)/$(SYSTEMDPATH)/tmpfiles.d
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]39 udevrulesdir = $(libudevdir)/rules.d
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]40diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]41index 1969dee0..d2b28233 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]42--- a/kpartx/kpartx.rules
43+++ b/kpartx/kpartx.rules
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]44@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]45 GOTO="kpartx_end"
46
47 LABEL="run_kpartx"
48-RUN+="/sbin/kpartx -un -p -part /dev/$name"
49+RUN+="/sbin/kpartx -un /dev/$name"
50
51 LABEL="kpartx_end"
52diff --git a/multipath/Makefile b/multipath/Makefile
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]53index 116348e2..8482de6a 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]54--- a/multipath/Makefile
55+++ b/multipath/Makefile
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]56@@ -23,7 +23,7 @@ install:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]57 $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
58 $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)
59 $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]60- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules
61+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules
62 $(INSTALL_PROGRAM) -d $(DESTDIR)$(modulesloaddir)
63 $(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf
64 $(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir)
65@@ -43,7 +43,7 @@ uninstall:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]66 $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]67 $(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf
68 $(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]69- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
70+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]71 $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
72 $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]73
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]74--
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame]752.38.1
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]76