From 2c704a5c869c38fd6631c48cef8d0600dff3315d Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 5 Nov 2024 14:04:54 +0100 Subject: [PATCH] * Tue Nov 05 2024 Tomas Bzatek - 1.47-10 - Skip symlink generation for multipath (RHEL-29139) Resolves: RHEL-29139 --- ...ymlink.rules-DM_MULTIPATH_DEVICE_PATH-skip.patch | 13 +++++++++++++ sg3_utils.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 63-scsi-sg3_symlink.rules-DM_MULTIPATH_DEVICE_PATH-skip.patch diff --git a/63-scsi-sg3_symlink.rules-DM_MULTIPATH_DEVICE_PATH-skip.patch b/63-scsi-sg3_symlink.rules-DM_MULTIPATH_DEVICE_PATH-skip.patch new file mode 100644 index 0000000..dbd1fb1 --- /dev/null +++ b/63-scsi-sg3_symlink.rules-DM_MULTIPATH_DEVICE_PATH-skip.patch @@ -0,0 +1,13 @@ +diff -up sg3_utils-1.47/scripts/58-scsi-sg3_symlink.rules.bak sg3_utils-1.47/scripts/58-scsi-sg3_symlink.rules +--- sg3_utils-1.47/scripts/58-scsi-sg3_symlink.rules.bak 2021-10-31 02:36:51.000000000 +0100 ++++ sg3_utils-1.47/scripts/58-scsi-sg3_symlink.rules 2024-11-05 13:51:48.624929865 +0100 +@@ -5,6 +5,9 @@ ACTION=="remove", GOTO="sg3_utils_symlin + SUBSYSTEM!="block", GOTO="sg3_utils_symlink_end" + ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="sg3_utils_symlink_end" + ++# Skip symlink generation for multipath ++ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="sg3_utils_symlink_end" ++ + # Select which identifier to use per default + # 0: vpd page 0x80 identifier + ENV{SCSI_IDENT_SERIAL}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-S$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_SERIAL}" diff --git a/sg3_utils.spec b/sg3_utils.spec index f67fd12..2d2e789 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -4,7 +4,7 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils Version: 1.47 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ and BSD URL: https://sg.danny.cz/sg/sg3_utils.html Source0: https://sg.danny.cz/sg/p/sg3_utils-%{version}.tar.xz @@ -30,6 +30,9 @@ Patch5: sg3_utils-1.48-rescan-scsi-bus.sh_seq_-s.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2073146 # missing new line in sg_vpd output Patch6: sg3_utils-1.48-sg_vpd_vendor-Fix-missing-newline-in-the-svpd_decode.patch +# https://issues.redhat.com/browse/RHEL-29139 +# 63-scsi-sg3_symlink.rules sets up symlinks for multipath paths +Patch7: 63-scsi-sg3_symlink.rules-DM_MULTIPATH_DEVICE_PATH-skip.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: make @@ -126,6 +129,9 @@ install -p -m 755 scripts/fc_wwpn_id $RPM_BUILD_ROOT%{_udevlibdir} %changelog +* Tue Nov 05 2024 Tomas Bzatek - 1.47-10 +- Skip symlink generation for multipath (RHEL-29139) + * Wed Jun 15 2022 Tomas Bzatek - 1.47-9 - Fix missing newline in sg_vpd output (#2073146)