|
 |
e65fa3 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
e65fa3 |
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
e65fa3 |
Date: Thu, 13 Apr 2017 07:22:23 -0500
|
|
|
e65fa3 |
Subject: [PATCH] RH: fixup udev rules for redhat
|
|
|
e65fa3 |
|
|
|
e65fa3 |
The multipath rules need to run after scsi_id is run. This means moving
|
|
|
e65fa3 |
them after 60-persistent-storage.rules for redhat. Redhat also uses a
|
|
|
e65fa3 |
different naming scheme for partitions than SuSE.
|
|
|
e65fa3 |
|
|
|
e65fa3 |
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
e65fa3 |
---
|
|
|
e65fa3 |
Makefile.inc | 2 +-
|
|
|
e65fa3 |
kpartx/kpartx.rules | 2 +-
|
|
|
e65fa3 |
multipath/Makefile | 4 ++--
|
|
|
e65fa3 |
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
e65fa3 |
|
|
|
e65fa3 |
diff --git a/Makefile.inc b/Makefile.inc
|
|
|
e65fa3 |
index d0ec9b44..2a75dc9c 100644
|
|
|
e65fa3 |
--- a/Makefile.inc
|
|
|
e65fa3 |
+++ b/Makefile.inc
|
|
|
e65fa3 |
@@ -55,7 +55,7 @@ endif
|
|
|
e65fa3 |
prefix =
|
|
|
e65fa3 |
exec_prefix = $(prefix)
|
|
|
e65fa3 |
usr_prefix = $(prefix)
|
|
|
e65fa3 |
-bindir = $(exec_prefix)/sbin
|
|
|
e65fa3 |
+bindir = $(exec_prefix)/usr/sbin
|
|
|
e65fa3 |
libudevdir = $(prefix)/$(SYSTEMDPATH)/udev
|
|
|
e65fa3 |
udevrulesdir = $(libudevdir)/rules.d
|
|
|
e65fa3 |
multipathdir = $(TOPDIR)/libmultipath
|
|
|
e65fa3 |
diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
|
|
|
e65fa3 |
index d7527d7d..0e0d70d5 100644
|
|
|
e65fa3 |
--- a/kpartx/kpartx.rules
|
|
|
e65fa3 |
+++ b/kpartx/kpartx.rules
|
|
|
e65fa3 |
@@ -36,6 +36,6 @@ LABEL="mpath_kpartx_end"
|
|
|
e65fa3 |
GOTO="kpartx_end"
|
|
|
e65fa3 |
|
|
|
e65fa3 |
LABEL="run_kpartx"
|
|
|
e65fa3 |
-RUN+="/sbin/kpartx -un -p -part /dev/$name"
|
|
|
e65fa3 |
+RUN+="/sbin/kpartx -un /dev/$name"
|
|
|
e65fa3 |
|
|
|
e65fa3 |
LABEL="kpartx_end"
|
|
|
e65fa3 |
diff --git a/multipath/Makefile b/multipath/Makefile
|
|
|
e65fa3 |
index 0828a8f7..b9bbb3cf 100644
|
|
|
e65fa3 |
--- a/multipath/Makefile
|
|
|
e65fa3 |
+++ b/multipath/Makefile
|
|
|
e65fa3 |
@@ -24,7 +24,7 @@ install:
|
|
|
e65fa3 |
$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
|
|
|
e65fa3 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)
|
|
|
e65fa3 |
$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
|
|
|
e65fa3 |
- $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
|
|
|
e65fa3 |
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
|
|
|
e65fa3 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
|
|
|
e65fa3 |
$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
|
|
|
e65fa3 |
$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
|
|
|
e65fa3 |
@@ -33,7 +33,7 @@ install:
|
|
|
e65fa3 |
uninstall:
|
|
|
e65fa3 |
$(RM) $(DESTDIR)$(bindir)/$(EXEC)
|
|
|
e65fa3 |
$(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
|
|
|
e65fa3 |
- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
|
|
|
e65fa3 |
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
|
|
|
e65fa3 |
$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
|
|
|
e65fa3 |
$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
|
|
|
e65fa3 |
|