mdadm-udev-rules-paths.patch

   1 diff -ur mdadm-4.2.orig/udev-md-clustered-confirm-device.rules mdadm-4.2/udev-md-clustered-confirm-device.rules
   2 --- mdadm-4.2.orig/udev-md-clustered-confirm-device.rules       2021-12-30 20:43:35.000000000 +0100
   3 +++ mdadm-4.2/udev-md-clustered-confirm-device.rules    2022-01-22 20:09:23.475366880 +0100
   4 @@ -13,9 +13,9 @@
   5  # Based on the received UUID, node confirms the device if
   6  # it is found by blkid, otherwise the node reports it is
   7  # missing.
   8 -PROGRAM="BINDIR/blkid -o device -t UUID_SUB=$env{DEVICE_UUID}", ENV{.md.newdevice} = "$result"
   9 +PROGRAM="/sbin/blkid -o device -t UUID_SUB=$env{DEVICE_UUID}", ENV{.md.newdevice} = "$result"
  10
  11 -ENV{.md.newdevice}!="", RUN+="BINDIR/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:$env{.md.newdevice}"
  12 -ENV{.md.newdevice}=="", RUN+="BINDIR/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing"
  13 +ENV{.md.newdevice}!="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:$env{.md.newdevice}"
  14 +ENV{.md.newdevice}=="", RUN+="/sbin/mdadm --manage $env{DEVNAME} --cluster-confirm $env{RAID_DISK}:missing"
  15
  16  LABEL="clustermd_end"
  17 diff -ur mdadm-4.2.orig/udev-md-raid-arrays.rules mdadm-4.2/udev-md-raid-arrays.rules
  18 --- mdadm-4.2.orig/udev-md-raid-arrays.rules    2021-12-30 20:43:35.000000000 +0100
  19 +++ mdadm-4.2/udev-md-raid-arrays.rules 2022-01-22 20:10:57.007556030 +0100
  20 @@ -18,7 +18,7 @@
  21  ATTR{md/sync_action}=="reshape", ENV{RESHAPE_ACTIVE}="yes"
  22  LABEL="md_ignore_state"
  23
  24 -IMPORT{program}="BINDIR/mdadm --detail --no-devices --export $devnode"
  25 +IMPORT{program}="/sbin/mdadm --detail --no-devices --export $devnode"
  26  ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
  27  ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
  28  ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
  29 @@ -37,8 +37,8 @@
  30  ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service"
  31
  32  # Tell systemd to run mdmon for our container, if we need it.
  33 -ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
  34 -ENV{MD_MON_THIS}=="?*", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
  35 -ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service"
  36 +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
  37 +ENV{MD_MON_THIS}=="?*", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
  38 +ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service"
  39
  40  LABEL="md_end"
  41 diff -ur mdadm-4.2.orig/udev-md-raid-assembly.rules mdadm-4.2/udev-md-raid-assembly.rules
  42 --- mdadm-4.2.orig/udev-md-raid-assembly.rules  2021-12-30 20:43:35.000000000 +0100
  43 +++ mdadm-4.2/udev-md-raid-assembly.rules       2022-01-22 20:09:23.475366880 +0100
  44 @@ -30,9 +30,9 @@
  45
  46  # remember you can limit what gets auto/incrementally assembled by
  47  # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
  48 -ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}"
  49 +ACTION=="add|change", IMPORT{program}="/sbin/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}"
  50  ACTION=="add|change", ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer"
  51 -ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="BINDIR/mdadm -If $name --path $env{ID_PATH}"
  52 -ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="BINDIR/mdadm -If $name"
  53 +ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
  54 +ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
  55
  56  LABEL="md_inc_end"