commit 6de75373d3e30d1a733b774f6499dd3d86832b70
Author: Jakub Bogusz <[email protected]>
Date: Sun Oct 6 09:15:55 2024 +0200
- updated to 0.10.0
multipath-tools-kpartx-udev.patch | 10 +++++-----
multipath-tools-paths.patch | 20 ++++++++++----------
multipath-tools.spec | 8 +++++---
3 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/multipath-tools.spec b/multipath-tools.spec
index b6d024d..0392e7c 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -1,18 +1,18 @@
#
# Conditional build:
%bcond_with initrd # build initrd version (very broken)
-%bcond_with systemd # systemd
+%bcond_without systemd # systemd support
Summary: Tools to manage multipathed devices with the device-mapper
Summary(pl.UTF-8): Implementacja wielotrasowego dostępu do zasobów przy
użyciu device-mappera
Name: multipath-tools
-Version: 0.9.5
+Version: 0.10.0
Release: 1
License: GPL v2
Group: Base
#Source0Download: https://github.com/opensvc/multipath-tools/tags
Source0:
https://github.com/opensvc/multipath-tools/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 4a2bb51973e962d653578063a6da14e9
+# Source0-md5: 025586178f9daedc857bc13a36963bb1
Source100: branch.sh
Source1: multipathd.init
Source2: multipathd.sysconfig
@@ -28,6 +28,7 @@ URL: http://christophe.varoqui.free.fr/
BuildRequires: device-mapper-devel >= 1.02.08
BuildRequires: json-c-devel
BuildRequires: libaio-devel
+BuildRequires: libmount-devel
BuildRequires: linux-libc-headers >= 7:2.6.12.0-5
BuildRequires: pkgconfig
BuildRequires: readline-devel
@@ -209,6 +210,7 @@ fi
/lib/udev/rules.d/11-dm-mpath.rules
/lib/udev/rules.d/11-dm-parts.rules
/lib/udev/rules.d/56-multipath.rules
+/lib/udev/rules.d/99-z-dm-mpath-late.rules
# TODO: package for systemd?
#/usr/lib/modules-load.d/multipath.conf
%if %{with systemd}
diff --git a/multipath-tools-kpartx-udev.patch
b/multipath-tools-kpartx-udev.patch
index f425b47..0036324 100644
--- a/multipath-tools-kpartx-udev.patch
+++ b/multipath-tools-kpartx-udev.patch
@@ -1,5 +1,5 @@
---- multipath-tools-0.8.8/kpartx/kpartx.rules.orig 2021-12-06
07:42:30.000000000 +0100
-+++ multipath-tools-0.8.8/kpartx/kpartx.rules 2022-02-19 20:33:03.368502706
+0100
+--- multipath-tools-0.10.0/kpartx/kpartx.rules.in.orig 2024-08-27
02:48:08.000000000 +0200
++++ multipath-tools-0.10.0/kpartx/kpartx.rules.in 2024-10-06
09:05:53.894147864 +0200
@@ -9,6 +9,9 @@ ACTION!="add|change", GOTO="kpartx_end"
ENV{DM_UUID}!="?*", GOTO="kpartx_end"
ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="kpartx_end"
@@ -10,11 +10,11 @@
# Create dm tables for partitions on multipath devices.
ENV{DM_UUID}!="mpath-?*", GOTO="mpath_kpartx_end"
-@@ -36,6 +39,6 @@ LABEL="mpath_kpartx_end"
+@@ -39,6 +42,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"
+-RUN+="@BINDIR@/kpartx -un -p -part /dev/$name"
++RUN+="@BINDIR@/kpartx -un /dev/$name"
LABEL="kpartx_end"
diff --git a/multipath-tools-paths.patch b/multipath-tools-paths.patch
index 0775b18..87943e9 100644
--- a/multipath-tools-paths.patch
+++ b/multipath-tools-paths.patch
@@ -8,9 +8,9 @@
+ RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
LABEL="end_del_part_nodes"
---- multipath-tools-0.7.9-5c67a8b/multipath/11-dm-mpath.rules.orig
2018-11-14 08:37:05.000000000 +0100
-+++ multipath-tools-0.7.9-5c67a8b/multipath/11-dm-mpath.rules 2018-12-01
21:53:03.777572075 +0100
-@@ -101,7 +101,7 @@
+--- multipath-tools-0.10.0/multipath/11-dm-mpath.rules.in.orig 2024-08-27
02:48:08.000000000 +0200
++++ multipath-tools-0.10.0/multipath/11-dm-mpath.rules.in 2024-10-06
08:58:41.853155098 +0200
+@@ -157,7 +157,7 @@ ENV{DM_UDEV_LOW_PRIORITY_FLAG}!="1", OPT
# kpartx_id is very robust, it works for suspended maps and maps
# with 0 dependencies. It sets DM_TYPE, DM_PART, DM_WWN
@@ -19,31 +19,31 @@
IMPORT{program}=="kpartx_id %M %m $env{DM_UUID}"
ENV{DM_TYPE}=="?*", ENV{DM_SERIAL}=="?*", \
---- multipath-tools-0.9.5/multipath/multipath.rules.in.orig 2023-04-06
08:47:48.000000000 +0200
-+++ multipath-tools-0.9.5/multipath/multipath.rules.in 2023-07-19
18:36:02.578378364 +0200
+--- multipath-tools-0.10.0/multipath/multipath.rules.in.orig 2024-10-06
08:59:02.376377247 +0200
++++ multipath-tools-0.10.0/multipath/multipath.rules.in 2024-10-06
09:03:42.348193843 +0200
@@ -2,7 +2,7 @@
SUBSYSTEM!="block", GOTO="end_mpath"
KERNEL!="sd*|dasd*|nvme*", GOTO="end_mpath"
ACTION=="remove",
TEST=="@RUNTIME_DIR@/multipath/find_multipaths/$major:$minor", \
-- RUN+="/usr/bin/rm -f
@RUNTIME_DIR@/multipath/find_multipaths/$major:$minor"
+- RUN+="@SYSDIR_BIN@/rm -f
@RUNTIME_DIR@/multipath/find_multipaths/$major:$minor"
+ RUN+="/bin/rm -f @RUNTIME_DIR@/multipath/find_multipaths/$major:$minor"
ACTION!="add|change", GOTO="end_mpath"
IMPORT{cmdline}="nompath"
-@@ -72,7 +72,7 @@ ENV{.SAVED_FM_WAIT_UNTIL}=="?*", GOTO="p
+@@ -69,7 +69,7 @@ ENV{.SAVED_FM_WAIT_UNTIL}=="?*", GOTO="p
#
# We must trigger an "add" event because LVM2 will only act on those.
--RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description
'cancel waiting for multipath siblings of $kernel' --no-block --timer-property
DefaultDependencies=no --timer-property Conflicts=shutdown.target
--timer-property Before=shutdown.target --timer-property
Conflicts=initrd-cleanup.service --timer-property Before=initrd-cleanup.service
--timer-property AccuracySec=500ms --property DefaultDependencies=no --property
Conflicts=shutdown.target --property Before=shutdown.target --property
Conflicts=initrd-cleanup.service --property Before=initrd-cleanup.service
--on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /usr/bin/udevadm trigger
--action=add $sys$devpath"
+-RUN+="@SYSDIR_BIN@/systemd-run --unit=cancel-multipath-wait-$kernel
--description 'cancel waiting for multipath siblings of $kernel' --no-block
--timer-property DefaultDependencies=no --timer-property
Conflicts=shutdown.target --timer-property Before=shutdown.target
--timer-property Conflicts=initrd-cleanup.service --timer-property
Before=initrd-cleanup.service --timer-property AccuracySec=500ms --property
DefaultDependencies=no --property Conflicts=shutdown.target --property
Before=shutdown.target --property Conflicts=initrd-cleanup.service --property
Before=initrd-cleanup.service --on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL}
@SYSDIR_BIN@/udevadm trigger --action=add $sys$devpath"
+RUN+="/usr/bin/systemd-run --unit=cancel-multipath-wait-$kernel --description
'cancel waiting for multipath siblings of $kernel' --no-block --timer-property
DefaultDependencies=no --timer-property Conflicts=shutdown.target
--timer-property Before=shutdown.target --timer-property
Conflicts=initrd-cleanup.service --timer-property Before=initrd-cleanup.service
--timer-property AccuracySec=500ms --property DefaultDependencies=no --property
Conflicts=shutdown.target --property Before=shutdown.target --property
Conflicts=initrd-cleanup.service --property Before=initrd-cleanup.service
--on-active=$env{FIND_MULTIPATHS_WAIT_UNTIL} /sbin/udevadm trigger --action=add
$sys$devpath"
LABEL="pretend_mpath"
ENV{DM_MULTIPATH_DEVICE_PATH}="1"
-@@ -88,7 +88,7 @@ ENV{FIND_MULTIPATHS_WAIT_UNTIL}!="?*", G
+@@ -85,7 +85,7 @@ ENV{FIND_MULTIPATHS_WAIT_UNTIL}!="?*", G
ENV{FIND_MULTIPATHS_WAIT_UNTIL}=="0", GOTO="end_mpath"
ENV{FIND_MULTIPATHS_WAIT_CANCELLED}="1"
--RUN+="/usr/bin/systemctl stop cancel-multipath-wait-$kernel.timer"
+-RUN+="@SYSDIR_BIN@/systemctl stop cancel-multipath-wait-$kernel.timer"
+RUN+="/bin/systemctl stop cancel-multipath-wait-$kernel.timer"
# If "multipath -u" failed, no values are imported from the program,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/multipath-tools.git/commitdiff/6de75373d3e30d1a733b774f6499dd3d86832b70
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
