2017-11-07 23:51:09 +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
|
2018-06-12 19:11:55 +00:00
|
|
|
different naming scheme for partitions than SuSE. Also, there are some
|
|
|
|
|
false warnings that gcc throws because of the changed options. Fix these
|
|
|
|
|
too.
|
2017-11-07 23:51:09 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
Makefile.inc | 2 +-
|
|
|
|
|
kpartx/kpartx.rules | 2 +-
|
|
|
|
|
multipath/Makefile | 4 ++--
|
2018-06-12 19:11:55 +00:00
|
|
|
multipath/main.c | 2 +-
|
|
|
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
2017-11-07 23:51:09 +00:00
|
|
|
|
|
|
|
|
diff --git a/Makefile.inc b/Makefile.inc
|
2018-09-27 22:56:43 +00:00
|
|
|
index a83f02c..b86cba6 100644
|
2017-11-07 23:51:09 +00:00
|
|
|
--- a/Makefile.inc
|
|
|
|
|
+++ b/Makefile.inc
|
2018-04-02 22:29:20 +00:00
|
|
|
@@ -51,7 +51,7 @@ endif
|
2017-11-07 23:51:09 +00:00
|
|
|
prefix =
|
|
|
|
|
exec_prefix = $(prefix)
|
|
|
|
|
usr_prefix = $(prefix)
|
|
|
|
|
-bindir = $(exec_prefix)/sbin
|
|
|
|
|
+bindir = $(exec_prefix)/usr/sbin
|
|
|
|
|
libudevdir = $(prefix)/$(SYSTEMDPATH)/udev
|
|
|
|
|
udevrulesdir = $(libudevdir)/rules.d
|
|
|
|
|
multipathdir = $(TOPDIR)/libmultipath
|
|
|
|
|
diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
|
|
|
|
|
index 8f99049..8a3a171 100644
|
|
|
|
|
--- a/kpartx/kpartx.rules
|
|
|
|
|
+++ b/kpartx/kpartx.rules
|
|
|
|
|
@@ -32,6 +32,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
|
2018-04-02 22:29:20 +00:00
|
|
|
index 0828a8f..b9bbb3c 100644
|
2017-11-07 23:51:09 +00:00
|
|
|
--- a/multipath/Makefile
|
|
|
|
|
+++ b/multipath/Makefile
|
|
|
|
|
@@ -24,7 +24,7 @@ install:
|
|
|
|
|
$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
|
|
|
|
|
$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)
|
|
|
|
|
$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
|
|
|
|
|
- $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
|
|
|
|
|
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
|
|
|
|
|
$(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
|
|
|
|
|
$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
|
|
|
|
|
$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
|
|
|
|
|
@@ -33,7 +33,7 @@ install:
|
|
|
|
|
uninstall:
|
|
|
|
|
$(RM) $(DESTDIR)$(bindir)/$(EXEC)
|
|
|
|
|
$(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
|
|
|
|
|
- $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
|
|
|
|
|
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules
|
|
|
|
|
$(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
|
|
|
|
|
$(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
|
|
|
|
|
|
2018-06-12 19:11:55 +00:00
|
|
|
diff --git a/multipath/main.c b/multipath/main.c
|
2018-10-10 05:16:58 +00:00
|
|
|
index 05b7bf0..ffa5b22 100644
|
2018-06-12 19:11:55 +00:00
|
|
|
--- a/multipath/main.c
|
|
|
|
|
+++ b/multipath/main.c
|
2018-10-10 05:16:58 +00:00
|
|
|
@@ -401,7 +401,7 @@ static int find_multipaths_check_timeout(const struct path *pp, long tmo,
|
2018-06-12 19:11:55 +00:00
|
|
|
struct timespec now, ftimes[2], tdiff;
|
|
|
|
|
struct stat st;
|
|
|
|
|
long fd;
|
|
|
|
|
- int r, err, retries = 0;
|
|
|
|
|
+ int r, err = 0, retries = 0;
|
|
|
|
|
|
|
|
|
|
clock_gettime(CLOCK_REALTIME, &now);
|
|
|
|
|
|
2017-11-07 23:51:09 +00:00
|
|
|
--
|
|
|
|
|
2.7.4
|
|
|
|
|
|
