Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 9a941729d3c0d19d30d65e16b291c380e589eeb3 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Benjamin Marzinski <bmarzins@redhat.com> |
| 3 | Date: Thu, 13 Apr 2017 07:22:23 -0500 |
| 4 | Subject: [PATCH] RH: fixup udev rules for redhat |
| 5 | |
| 6 | The multipath rules need to run after scsi_id is run. This means moving |
| 7 | them after 60-persistent-storage.rules for redhat. Redhat also uses a |
| 8 | different naming scheme for partitions than SuSE. Also, there are some |
| 9 | false warnings that gcc throws because of the changed options. Fix these |
| 10 | too. |
| 11 | |
| 12 | Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 13 | |
| 14 | Update patch to 0.8.0 |
| 15 | |
| 16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 17 | [OP: Rebase to 0.9.3] |
| 18 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 19 | --- |
| 20 | Makefile.inc | 2 +- |
| 21 | kpartx/kpartx.rules | 2 +- |
| 22 | multipath/Makefile | 4 ++-- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 23 | 3 files changed, 4 insertions(+), 4 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 24 | |
| 25 | diff --git a/Makefile.inc b/Makefile.inc |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 26 | index 4d843ce5..57779fd8 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 27 | --- a/Makefile.inc |
| 28 | +++ b/Makefile.inc |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 29 | @@ -81,7 +81,7 @@ endif |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 30 | prefix = |
| 31 | exec_prefix = $(prefix) |
| 32 | usr_prefix = $(prefix) |
| 33 | -bindir = $(exec_prefix)/sbin |
| 34 | +bindir = $(exec_prefix)/usr/sbin |
| 35 | libudevdir = $(prefix)/$(SYSTEMDPATH)/udev |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 36 | tmpfilesdir = $(prefix)/$(SYSTEMDPATH)/tmpfiles.d |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 37 | udevrulesdir = $(libudevdir)/rules.d |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 38 | diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 39 | index 1969dee0..d2b28233 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 40 | --- a/kpartx/kpartx.rules |
| 41 | +++ b/kpartx/kpartx.rules |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 42 | @@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end" |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 43 | GOTO="kpartx_end" |
| 44 | |
| 45 | LABEL="run_kpartx" |
| 46 | -RUN+="/sbin/kpartx -un -p -part /dev/$name" |
| 47 | +RUN+="/sbin/kpartx -un /dev/$name" |
| 48 | |
| 49 | LABEL="kpartx_end" |
| 50 | diff --git a/multipath/Makefile b/multipath/Makefile |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 51 | index 116348e2..8482de6a 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 52 | --- a/multipath/Makefile |
| 53 | +++ b/multipath/Makefile |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 54 | @@ -23,7 +23,7 @@ install: |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 55 | $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ |
| 56 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir) |
| 57 | $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 58 | - $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/56-multipath.rules |
| 59 | + $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)$(udevrulesdir)/62-multipath.rules |
| 60 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(modulesloaddir) |
| 61 | $(INSTALL_PROGRAM) -m 644 modules-load.conf $(DESTDIR)$(modulesloaddir)/multipath.conf |
| 62 | $(INSTALL_PROGRAM) -d $(DESTDIR)$(tmpfilesdir) |
| 63 | @@ -43,7 +43,7 @@ uninstall: |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 64 | $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 65 | $(RM) $(DESTDIR)$(modulesloaddir)/multipath.conf |
| 66 | $(RM) $(DESTDIR)$(modulesloaddir)/scsi_dh.conf |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 67 | - $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules |
| 68 | + $(RM) $(DESTDIR)$(libudevdir)/rules.d/62-multipath.rules |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 69 | $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8 |
| 70 | $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 71 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 72 | -- |
Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 73 | 2.38.1 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 74 | |