From 6d8adf7dd6a8bf755f5950a7dc05d7217b4c13b66d4bffb3f03724d9415ad915 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 22 Nov 2023 12:35:18 +0000 Subject: [PATCH] Accepting request 1128106 from home:mwilck:multipath - Update to version 0.9.7+76+suse.5f857af: * Update to upstream 0.9.7 (jsc#PED-6464) * added max_retries config option to limit SCSI retries * added auto_resize config option to enable resizing multipath maps automatically * fixed memory and error handling for code using aio (marginal path code, directio path checker) * dropped modules-load.d/multipath.conf; replaced by a dependency on modprobe@dm-multipath.service (systemd >= 245: SLE15-SP3 and later only) and a softdep on sd_mod for the SCSI device handlers (bsc#1217377) * On SLE/Leap suse-module-tools doesn't ship a scsi_mod->sd_mod softdep yet. Add it here, too. It will be overridden by s-m-t when it's added there. * drop usr_prefix= setting in SLE build recipes (set to /usr by upstream automatically) OBS-URL: https://build.opensuse.org/request/show/1128106 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=322 --- _servicedata | 2 +- modprobe_d-scsi_dh.conf | 10 ++++++++++ multipath-tools-0.9.6+115+suse.07776fb.obscpio | 3 --- multipath-tools-0.9.7+76+suse.5f857af.obscpio | 3 +++ multipath-tools.changes | 18 ++++++++++++++++++ multipath-tools.obsinfo | 6 +++--- multipath-tools.spec | 15 +++++++++------ multipath.conf | 5 ----- 8 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 modprobe_d-scsi_dh.conf delete mode 100644 multipath-tools-0.9.6+115+suse.07776fb.obscpio create mode 100644 multipath-tools-0.9.7+76+suse.5f857af.obscpio delete mode 100644 multipath.conf diff --git a/_servicedata b/_servicedata index b99ff2c..708fd0c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - 07776fbb60471c83dda3f463d3c02cc67a921aef \ No newline at end of file + 5f857aff9b5a912b5d3361085c85d02251d39337 \ No newline at end of file diff --git a/modprobe_d-scsi_dh.conf b/modprobe_d-scsi_dh.conf new file mode 100644 index 0000000..ca779e4 --- /dev/null +++ b/modprobe_d-scsi_dh.conf @@ -0,0 +1,10 @@ +# Make sure scsi device handlers are loaded before any SCSI host adapter +# drivers. This requires loading sd_mod before host adapters, which +# is ensured by the scsi_mod softdep below. +softdep sd_mod pre: scsi_dh_alua scsi_dh_rdac scsi_dh_emc + +# Note that there can be only one softdep per module, and earlier +# directives take precedence. 10-scsi.conf is shipped by suse-module-tools +# in some SUSE releases; it will override the scsi_mod softdep below. +# (but it will also make sure that sd_mod is loaded early). +softdep scsi_mod post: sd_mod diff --git a/multipath-tools-0.9.6+115+suse.07776fb.obscpio b/multipath-tools-0.9.6+115+suse.07776fb.obscpio deleted file mode 100644 index 7dbf080..0000000 --- a/multipath-tools-0.9.6+115+suse.07776fb.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb9e8fcbb5ea7542e92076d612f45307b38762ead841b585010cdaf719397782 -size 2833420 diff --git a/multipath-tools-0.9.7+76+suse.5f857af.obscpio b/multipath-tools-0.9.7+76+suse.5f857af.obscpio new file mode 100644 index 0000000..9f911b6 --- /dev/null +++ b/multipath-tools-0.9.7+76+suse.5f857af.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d995603992f4bdbe203802c53ef70fcb9c11b8af280479684fc42f870be2985 +size 2837516 diff --git a/multipath-tools.changes b/multipath-tools.changes index f6792c8..b996964 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Nov 21 20:46:40 UTC 2023 - Martin Wilck + +- Update to version 0.9.7+76+suse.5f857af: + * Update to upstream 0.9.7 (jsc#PED-6464) + * added max_retries config option to limit SCSI retries + * added auto_resize config option to enable resizing multipath maps automatically + * fixed memory and error handling for code using aio (marginal path code, + directio path checker) + * dropped modules-load.d/multipath.conf; replaced by a dependency on + modprobe@dm-multipath.service (systemd >= 245: SLE15-SP3 and later only) + and a softdep on sd_mod for the SCSI device handlers + (bsc#1217377) + * On SLE/Leap suse-module-tools doesn't ship a scsi_mod->sd_mod softdep yet. + Add it here, too. It will be overridden by s-m-t when it's added there. + * drop usr_prefix= setting in SLE build recipes (set to /usr by upstream + automatically) + ------------------------------------------------------------------- Wed Oct 25 10:46:30 UTC 2023 - Martin Wilck diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo index 3f26baf..a724cda 100644 --- a/multipath-tools.obsinfo +++ b/multipath-tools.obsinfo @@ -1,4 +1,4 @@ name: multipath-tools -version: 0.9.6+115+suse.07776fb -mtime: 1698230447 -commit: 07776fbb60471c83dda3f463d3c02cc67a921aef +version: 0.9.7+76+suse.5f857af +mtime: 1700563750 +commit: 5f857aff9b5a912b5d3361085c85d02251d39337 diff --git a/multipath-tools.spec b/multipath-tools.spec index 899301d..f2da63b 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -19,7 +19,7 @@ %global _lto_cflags %{nil} %global _make_output_sync -Orecurse -# multipath-tools auto-detects support for -D_FORTFY_SOURCE. +# multipath-tools auto-detects support for -D_FORTIFY_SOURCE. # This will lead to a compilation error if the distro overrides # -D_FORTIFY_SOURCE in optflags, unless it's preceded with -U_FORTIFY_SOURCE %global mp_optflags %(echo %{optflags} | sed '/-U_FORTIFY_SOURCE/!s/-D_FORTIFY_SOURCE=[0-9]/-U_FORTIFY_SOURCE &/') @@ -35,14 +35,15 @@ %define libdmmp_version %(echo %{_libdmmp_version} | tr . _) Name: multipath-tools -Version: 0.9.6+115+suse.07776fb +Version: 0.9.7+76+suse.5f857af Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND GPL-3.0-or-later Group: System/Base URL: http://christophe.varoqui.free.fr/ Source: multipath-tools-%{version}.tar -Source1: multipath.conf +# modprobe.d configuration file +Source1: modprobe_d-scsi_dh.conf # SUSE policy: disable partition deletion by default Source2: dont-del-part-nodes.rules # Dracut conf file to make sure 11-dm-parts.rules is included in initrd @@ -149,7 +150,7 @@ This package provides development files and documentation for libdmmp. %global extraversion %(echo %{version} | sed 's/^[^+]*//') %define makeflags EXTRAVERSION="%{extraversion}" %{!?with_libdmmp:ENABLE_LIBDMMP=0} %if 0%{?suse_version} < 1550 -%define dirflags LIB=%{_lib} usr_prefix=%{_prefix} +%define dirflags LIB=%{_lib} %define sbindir /sbin %define libdir /%{_lib} %else @@ -186,8 +187,7 @@ for x in mpathutil multipath mpathpersist mpathcmd mpathvalid; do done %endif ln -sf service %{buildroot}/usr/sbin/rcmultipathd -mkdir -p %{buildroot}/usr/lib/modules-load.d -install -m 644 -D %{SOURCE1} "%{buildroot}/usr/lib/modules-load.d/multipath.conf" +install -m 644 -D %{SOURCE1} %{buildroot}/usr/lib/modprobe.d/90-scsi_dh.conf install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/00-dont-del-part-nodes.rules install -m 644 -D %{SOURCE3} %{buildroot}/usr/lib/dracut/dracut.conf.d/dm-parts.conf install -m 644 -D %{SOURCE6} %{buildroot}/usr/lib/dracut/dracut.conf.d/multipath.conf @@ -234,11 +234,14 @@ exit 0 /usr/sbin/rcmultipathd %{_unitdir}/multipathd.service %{_unitdir}/multipathd.socket +%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300 %dir /usr/lib/modules-load.d /usr/lib/modules-load.d/multipath.conf +%endif %dir /usr/lib/dracut %dir /usr/lib/dracut/dracut.conf.d /usr/lib/dracut/dracut.conf.d/multipath.conf +/usr/lib/modprobe.d/90-scsi_dh.conf %{_tmpfilesdir}/multipath.conf %{_mandir}/man8/multipath.8* %{_mandir}/man5/multipath.conf.5* diff --git a/multipath.conf b/multipath.conf deleted file mode 100644 index 37e9e78..0000000 --- a/multipath.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Load device-handler and multipath module at boot -scsi_dh_alua -scsi_dh_emc -scsi_dh_rdac -dm-multipath