Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 5b9ede0403237c7dace972affa65cf64a1aadd0e / . / meta-openembedded / meta-oe / recipes-support / multipath-tools / files / 0002-RH-fixup-udev-rules-for-redhat.patch
blob: e63d2eb33f9932785cbab0dfb77c19f02c9cf93e [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame]1From 158255383c02d3fb81c82fb9ec6fd36fb234f68e Mon Sep 17 00:00:00 2001
2From: Benjamin Marzinski <bmarzins@redhat.com>
3Date: Thu, 13 Apr 2017 07:22:23 -0500
4Subject: [PATCH 02/14] 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. Also, we don't
8currently set up all the symlinks that SuSE does. If we want them, they
9should be done in the device-mapper package, since they are for all
10device-mapper devices. Redhat also uses a different naming scheme for
11partitions than SuSE.
12
13Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
14---
15 Makefile.inc | 2 +-
16 kpartx/Makefile | 14 +++++++-------
17 multipath/Makefile | 4 ++--
18 multipath/multipath.rules | 3 ++-
19 4 files changed, 12 insertions(+), 11 deletions(-)
20
21diff --git a/Makefile.inc b/Makefile.inc
22index 1815f9a..2591fa9 100644
23--- a/Makefile.inc
24+++ b/Makefile.inc
25@@ -47,7 +47,7 @@ endif
26
27 prefix =
28 exec_prefix = $(prefix)
29-bindir = $(exec_prefix)/sbin
30+bindir = $(exec_prefix)/usr/sbin
31 libudevdir = $(prefix)/$(SYSTEMDPATH)/udev
32 udevrulesdir = $(libudevdir)/rules.d
33 multipathdir = $(TOPDIR)/libmultipath
34diff --git a/kpartx/Makefile b/kpartx/Makefile
35index 7b75032..bfa6fe8 100644
36--- a/kpartx/Makefile
37+++ b/kpartx/Makefile
38@@ -26,19 +26,19 @@ $(EXEC): $(OBJS)
39 install: $(EXEC) $(EXEC).8
40 $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
41 $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
42- $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
43- $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
44- $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)/rules.d
45- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
46+# $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
47+# $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
48+# $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)/rules.d
49+# $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
50 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
51 $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
52
53 uninstall:
54 $(RM) $(DESTDIR)$(bindir)/$(EXEC)
55 $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
56- $(RM) $(DESTDIR)$(libudevdir)/kpartx_id
57- $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
58- $(RM) $(DESTDIR)$(libudevdir)/rules.d/67-kpartx-compat.rules
59+# $(RM) $(DESTDIR)$(libudevdir)/kpartx_id
60+# $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
61+# $(RM) $(DESTDIR)$(libudevdir)/rules.d/67-kpartx-compat.rules
62
63 clean:
64 $(RM) core *.o $(EXEC) *.gz
65diff --git a/multipath/Makefile b/multipath/Makefile
66index c85314e..1e9ee4b 100644
67--- a/multipath/Makefile
68+++ b/multipath/Makefile
69@@ -24,7 +24,7 @@ install:
70 $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
71 $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)
72 $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
73- $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
74+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
75 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
76 $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
77 $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
78@@ -33,7 +33,7 @@ install:
79 uninstall:
80 $(RM) $(DESTDIR)$(bindir)/$(EXEC)
81 $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
82- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
83+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
84 $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
85 $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
86
87diff --git a/multipath/multipath.rules b/multipath/multipath.rules
88index 616a04c..4d78b98 100644
89--- a/multipath/multipath.rules
90+++ b/multipath/multipath.rules
91@@ -33,6 +33,7 @@ GOTO="end_mpath"
92
93 LABEL="check_kpartx"
94
95+ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10"
96 IMPORT{db}="DM_MULTIPATH_NEED_KPARTX"
97 ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}!="1", IMPORT{db}="DM_SUBSYSTEM_UDEV_FLAG1"
98 ENV{DM_SUBSYSTEM_UDEV_FLAG1}=="1", GOTO="end_mpath"
99@@ -42,7 +43,7 @@ ENV{DM_ACTIVATION}=="1", ENV{DM_MULTIPATH_NEED_KPARTX}="1"
100 ENV{DM_SUSPENDED}=="1", GOTO="end_mpath"
101 ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath"
102 ENV{DM_ACTIVATION}!="1", ENV{DM_MULTIPATH_NEED_KPARTX}!="1", GOTO="end_mpath"
103-RUN+="/sbin/kpartx -un -p -part /dev/$name"
104+RUN+="/sbin/kpartx -un /dev/$name"
105 ENV{DM_MULTIPATH_NEED_KPARTX}=""
106
107 LABEL="end_mpath"
108--
1092.8.1
110