]> TLD Linux GIT Repositories - packages/mdadm.git/blob - mdadm-udev-rules-paths.patch
- updated to 4.3
[packages/mdadm.git] / mdadm-udev-rules-paths.patch
1 diff -ur mdadm-4.3.orig/udev-md-clustered-confirm-device.rules mdadm-4.3/udev-md-clustered-confirm-device.rules
2 --- mdadm-4.3.orig/udev-md-clustered-confirm-device.rules       2024-02-15 17:33:04.000000000 +0100
3 +++ mdadm-4.3/udev-md-clustered-confirm-device.rules    2024-04-03 02:28:17.711611149 +0200
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.3.orig/udev-md-raid-arrays.rules mdadm-4.3/udev-md-raid-arrays.rules
18 --- mdadm-4.3.orig/udev-md-raid-arrays.rules    2024-02-15 17:33:04.000000000 +0100
19 +++ mdadm-4.3/udev-md-raid-arrays.rules 2024-04-03 02:29:45.900799937 +0200
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,9 +37,9 @@
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}=="?*", TEST=="/etc/initrd-release", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@initrd-%c.service"
35 -ENV{MD_MON_THIS}=="?*", TEST!="/etc/initrd-release", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
36 -ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/usr/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service"
37 +ENV{MD_LEVEL}=="raid[1-9]*", ENV{MD_CONTAINER}=="?*", PROGRAM="/bin/readlink $env{MD_CONTAINER}", ENV{MD_MON_THIS}="%c"
38 +ENV{MD_MON_THIS}=="?*", TEST=="/etc/initrd-release", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@initrd-%c.service"
39 +ENV{MD_MON_THIS}=="?*", TEST!="/etc/initrd-release", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdmon@%c.service"
40 +ENV{RESHAPE_ACTIVE}=="yes", PROGRAM="/bin/basename $env{MD_MON_THIS}", ENV{SYSTEMD_WANTS}+="mdadm-grow-continue@%c.service"
41  
42  LABEL="md_end"
43 diff -ur mdadm-4.3.orig/udev-md-raid-assembly.rules mdadm-4.3/udev-md-raid-assembly.rules
44 --- mdadm-4.3.orig/udev-md-raid-assembly.rules  2024-02-15 17:33:04.000000000 +0100
45 +++ mdadm-4.3/udev-md-raid-assembly.rules       2024-04-03 02:29:03.096222931 +0200
46 @@ -38,10 +38,10 @@
47  
48  # remember you can limit what gets auto/incrementally assembled by
49  # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
50 -ACTION!="remove", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}"
51 +ACTION!="remove", IMPORT{program}="/sbin/mdadm --incremental --export $devnode --offroot $env{DEVLINKS}"
52  ACTION!="remove", ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer"
53  
54 -ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="BINDIR/mdadm -If $name --path $env{ID_PATH}"
55 -ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="BINDIR/mdadm -If $name"
56 +ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
57 +ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
58  
59  LABEL="md_inc_end"