From 896f93e62affe71ab4fb06b47fd406ba14bc0594 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 4 Apr 2024 01:06:11 +0200 Subject: [PATCH] - updated to 4.3 --- mdadm-udev-rules-paths.patch | 35 +++++++++++++++++++---------------- mdadm.spec | 5 +++-- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/mdadm-udev-rules-paths.patch b/mdadm-udev-rules-paths.patch index f3fbf2a..07ae977 100644 --- a/mdadm-udev-rules-paths.patch +++ b/mdadm-udev-rules-paths.patch @@ -1,6 +1,6 @@ -diff -ur mdadm-4.2.orig/udev-md-clustered-confirm-device.rules mdadm-4.2/udev-md-clustered-confirm-device.rules ---- mdadm-4.2.orig/udev-md-clustered-confirm-device.rules 2021-12-30 20:43:35.000000000 +0100 -+++ mdadm-4.2/udev-md-clustered-confirm-device.rules 2022-01-22 20:09:23.475366880 +0100 +diff -ur mdadm-4.3.orig/udev-md-clustered-confirm-device.rules mdadm-4.3/udev-md-clustered-confirm-device.rules +--- mdadm-4.3.orig/udev-md-clustered-confirm-device.rules 2024-02-15 17:33:04.000000000 +0100 ++++ mdadm-4.3/udev-md-clustered-confirm-device.rules 2024-04-03 02:28:17.711611149 +0200 @@ -13,9 +13,9 @@ # Based on the received UUID, node confirms the device if # it is found by blkid, otherwise the node reports it is @@ -14,9 +14,9 @@ diff -ur mdadm-4.2.orig/udev-md-clustered-confirm-device.rules mdadm-4.2/udev-md +ENV{.md.newdevice}=="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing" LABEL="clustermd_end" -diff -ur mdadm-4.2.orig/udev-md-raid-arrays.rules mdadm-4.2/udev-md-raid-arrays.rules ---- mdadm-4.2.orig/udev-md-raid-arrays.rules 2021-12-30 20:43:35.000000000 +0100 -+++ mdadm-4.2/udev-md-raid-arrays.rules 2022-01-22 20:10:57.007556030 +0100 +diff -ur mdadm-4.3.orig/udev-md-raid-arrays.rules mdadm-4.3/udev-md-raid-arrays.rules +--- mdadm-4.3.orig/udev-md-raid-arrays.rules 2024-02-15 17:33:04.000000000 +0100 ++++ mdadm-4.3/udev-md-raid-arrays.rules 2024-04-03 02:29:45.900799937 +0200 @@ -18,7 +18,7 @@ ATTR{md/sync_action}=="reshape", ENV{RESHAPE_ACTIVE}="yes" LABEL="md_ignore_state" @@ -26,28 +26,31 @@ diff -ur mdadm-4.2.orig/udev-md-raid-arrays.rules mdadm-4.2/udev-md-raid-arrays. ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" -@@ -37,8 +37,8 @@ +@@ -37,9 +37,9 @@ ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service" # Tell systemd to run mdmon for our container, if we need it. -ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" --ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" +-ENV{MD_MON_THIS}=="?*", TEST=="/etc/initrd-release", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@initrd-%c.service" +-ENV{MD_MON_THIS}=="?*", TEST!="/etc/initrd-release", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" -ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service" +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c" -+ENV{MD_MON_THIS}=="?*", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" ++ENV{MD_MON_THIS}=="?*", TEST=="/etc/initrd-release", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@initrd-%c.service" ++ENV{MD_MON_THIS}=="?*", TEST!="/etc/initrd-release", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service" +ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service" LABEL="md_end" -diff -ur mdadm-4.2.orig/udev-md-raid-assembly.rules mdadm-4.2/udev-md-raid-assembly.rules ---- mdadm-4.2.orig/udev-md-raid-assembly.rules 2021-12-30 20:43:35.000000000 +0100 -+++ mdadm-4.2/udev-md-raid-assembly.rules 2022-01-22 20:09:23.475366880 +0100 -@@ -30,9 +30,9 @@ +diff -ur mdadm-4.3.orig/udev-md-raid-assembly.rules mdadm-4.3/udev-md-raid-assembly.rules +--- mdadm-4.3.orig/udev-md-raid-assembly.rules 2024-02-15 17:33:04.000000000 +0100 ++++ mdadm-4.3/udev-md-raid-assembly.rules 2024-04-03 02:29:03.096222931 +0200 +@@ -38,10 +38,10 @@ # remember you can limit what gets auto/incrementally assembled by # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' --ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}" -+ACTION=="add|change", IMPORT{program}="/sbin/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}" - ACTION=="add|change", ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer" +-ACTION!="remove", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}" ++ACTION!="remove", IMPORT{program}="/sbin/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}" + ACTION!="remove", ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer" + -ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="BINDIR/mdadm -If $name --path $env{ID_PATH}" -ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="BINDIR/mdadm -If $name" +ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}" diff --git a/mdadm.spec b/mdadm.spec index 72f98aa..7972aad 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -7,18 +7,19 @@ Summary: Tool for creating and maintaining software RAID devices Summary(pl.UTF-8): Narzędzie do tworzenia i obsługi programowych macierzy RAID Name: mdadm -Version: 4.2 +Version: 4.3 Release: 1 License: GPL v2+ Group: Base Source0: https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz -# Source0-md5: a304eb0a978ca81045620d06547050a6 +# Source0-md5: a42def84e31734a529111394f2289e0e Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.cron Source4: %{name}-checkarray Patch0: %{name}-udev-rules-paths.patch URL: https://www.kernel.org/pub/linux/utils/raid/mdadm/ +BuildRequires: corosync-devel BuildRequires: dlm-devel BuildRequires: groff BuildRequires: rpmbuild(macros) >= 1.671 -- 2.46.0