- updated to 4.3

[packages/mdadm.git] / mdadm-udev-rules-paths.patch

diff --git a/mdadm-udev-rules-paths.patch b/mdadm-udev-rules-paths.patch
index 439dc4dd28cfb29e9e52efcc5eb2a4a5aeacfe81..07ae97723085cafbe25d4fa8e45a36544ecf84ca 100644 (file)
--- a/mdadm-udev-rules-paths.patch
+++ b/mdadm-udev-rules-paths.patch
@@ -1,21 +1,59 @@
---- udev-md-raid-arrays.rules.orig     2015-08-03 06:17:13.000000000 +0000
-+++ udev-md-raid-arrays.rules  2015-09-01 08:57:31.874593251 +0000
-@@ -17,7 +17,7 @@
- ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
+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
+ # missing.
+-PROGRAM="BINDIR/blkid -o device -t UUID_SUB=$env{DEVICE_UUID}", ENV{.md.newdevice} = "$result"
++PROGRAM="/sbin/blkid -o device -t UUID_SUB=$env{DEVICE_UUID}", ENV{.md.newdevice} = "$result"
+ 
+-ENV{.md.newdevice}!="", RUN+="BINDIR/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:$env{.md.newdevice}"
+-ENV{.md.newdevice}=="", RUN+="BINDIR/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing"
++ENV{.md.newdevice}!="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:$env{.md.newdevice}"
++ENV{.md.newdevice}=="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing"
+ 
+ LABEL="clustermd_end"
+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"
  
--IMPORT{program}="BINDIR/mdadm --detail --export $devnode"
-+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
+-IMPORT{program}="BINDIR/mdadm --detail --no-devices --export $devnode"
++IMPORT{program}="/sbin/mdadm --detail --no-devices --export $devnode"
  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}"
-@@ -35,7 +35,7 @@
+@@ -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.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!="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}"
++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
+ 
+ LABEL="md_inc_end"