2022-11-16 20:11:59 +00:00
|
|
|
From 0000000000000000000000000000000000000000 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.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
Makefile.inc | 4 ++--
|
|
|
|
|
kpartx/kpartx.rules | 2 +-
|
|
|
|
|
multipath/Makefile | 4 ++--
|
|
|
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/Makefile.inc b/Makefile.inc
|
2023-01-27 01:02:53 +00:00
|
|
|
index 2e25d2ea..540e1dfc 100644
|
2022-11-16 20:11:59 +00:00
|
|
|
--- a/Makefile.inc
|
|
|
|
|
+++ b/Makefile.inc
|
|
|
|
|
@@ -34,9 +34,9 @@ endif
|
|
|
|
|
# Paths. All these can be overridden on the "make" command line.
|
|
|
|
|
prefix :=
|
|
|
|
|
# Prefix for binaries
|
|
|
|
|
-exec_prefix := $(prefix)
|
|
|
|
|
+exec_prefix := $(prefix)/usr
|
|
|
|
|
# Prefix for non-essential libraries (libdmmp)
|
|
|
|
|
-usr_prefix := $(prefix)
|
|
|
|
|
+usr_prefix := $(prefix)/usr
|
|
|
|
|
# Where to install systemd-related files. systemd is usually installed under /usr
|
|
|
|
|
# Note: some systemd installations use separate "prefix" and "rootprefix".
|
|
|
|
|
# In this case, override only unitdir to use systemd's "rootprefix" instead of $(systemd_prefix)
|
|
|
|
|
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 73db991a..b3c2cc81 100644
|
|
|
|
|
--- a/multipath/Makefile
|
|
|
|
|
+++ b/multipath/Makefile
|
|
|
|
|
@@ -24,7 +24,7 @@ install:
|
|
|
|
|
$(Q)$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
|
|
|
|
|
$(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)
|
|
|
|
|
$(Q)$(INSTALL_PROGRAM) -m 644 11-dm-mpath.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)$(modulesloaddir)
|
|
|
|
|
$(Q)$(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf
|
|
|
|
|
$(Q)$(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir)
|
|
|
|
|
@@ -44,7 +44,7 @@ uninstall:
|
|
|
|
|
$(Q)$(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.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
|
|
|
|
|
|
