- updated to 4.1, partial merge from PLD

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

diff --git a/mdadm-udev-rules-paths.patch b/mdadm-udev-rules-paths.patch
index 439dc4dd28cfb29e9e52efcc5eb2a4a5aeacfe81..00d34c8d78edb1a85eb5b8d9141bbad4bad2f1f1 100644 (file)
--- a/mdadm-udev-rules-paths.patch
+++ b/mdadm-udev-rules-paths.patch
@@ -1,5 +1,22 @@
---- 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
+diff -ur mdadm-4.1.orig/udev-md-clustered-confirm-device.rules mdadm-4.1/udev-md-clustered-confirm-device.rules
+--- mdadm-4.1.orig/udev-md-clustered-confirm-device.rules      2018-10-01 18:26:06.000000000 +0000
++++ mdadm-4.1/udev-md-clustered-confirm-device.rules   2018-12-04 08:16:15.690403000 +0000
+@@ -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.1.orig/udev-md-raid-arrays.rules mdadm-4.1/udev-md-raid-arrays.rules
+--- mdadm-4.1.orig/udev-md-raid-arrays.rules   2018-10-01 18:26:06.000000000 +0000
++++ mdadm-4.1/udev-md-raid-arrays.rules        2018-12-04 08:16:51.490403000 +0000
 @@ -17,7 +17,7 @@
  ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
  LABEL="md_ignore_state"
@@ -19,3 +36,19 @@
 +ENV{MD_MON_THIS}=="?*", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
  
  LABEL="md_end"
+diff -ur mdadm-4.1.orig/udev-md-raid-assembly.rules mdadm-4.1/udev-md-raid-assembly.rules
+--- mdadm-4.1.orig/udev-md-raid-assembly.rules 2018-10-01 18:26:06.000000000 +0000
++++ mdadm-4.1/udev-md-raid-assembly.rules      2018-12-04 08:17:07.490403000 +0000
+@@ -30,9 +30,9 @@
+ 
+ # 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", 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"