diff --git a/storage/mdadm/files/udev-md-raid-arrays.rules b/storage/mdadm/files/udev-md-raid-arrays.rules index 7e5ef541..4632c963 100644 --- a/storage/mdadm/files/udev-md-raid-arrays.rules +++ b/storage/mdadm/files/udev-md-raid-arrays.rules @@ -17,7 +17,7 @@ TEST!="md/array_state", GOTO="md_end" ATTR{md/array_state}=="clear*|inactive", GOTO="md_end" LABEL="md_ignore_state" -IMPORT{program}="/usr/local/sbin/mdadm --detail -c /var/run/mdadm/mdadm.conf --no-devices --export $devnode" +IMPORT{program}="/usr/local/sbin/mdadm --detail -c /var/lib/mdadm/mdadm.conf --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}" diff --git a/storage/mdadm/files/udev-md-raid-assembly.rules b/storage/mdadm/files/udev-md-raid-assembly.rules index f961a602..948d55fa 100644 --- a/storage/mdadm/files/udev-md-raid-assembly.rules +++ b/storage/mdadm/files/udev-md-raid-assembly.rules @@ -23,7 +23,7 @@ LABEL="md_inc" # 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}="/usr/local/sbin/mdadm --incremental -c /var/run/mdadm/mdadm.conf --export $devnode --offroot $env{DEVLINKS}" +ACTION=="add|change", IMPORT{program}="/usr/local/sbin/mdadm --incremental -c /var/lib/mdadm/mdadm.conf --export $devnode --offroot $env{DEVLINKS}" ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/local/sbin/mdadm -If $name --path $env{ID_PATH}" ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/local/sbin/mdadm -If $name" diff --git a/storage/mdadm/patches/change-sysconfdir.patch b/storage/mdadm/patches/change-sysconfdir.patch index c1c0c45e..77f31e1f 100644 --- a/storage/mdadm/patches/change-sysconfdir.patch +++ b/storage/mdadm/patches/change-sysconfdir.patch @@ -5,7 +5,7 @@ PKG_CONFIG ?= pkg-config -SYSCONFDIR = /etc -+SYSCONFDIR = /var/run/mdadm/ ++SYSCONFDIR = /var/lib/mdadm/ CONFFILE = $(SYSCONFDIR)/mdadm.conf CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf MAILCMD =/usr/sbin/sendmail -t