diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-10 20:55:45 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-10 20:55:45 +0000 |
commit | 2c958b35ba11c61dd2b7416d2f6067655512d2b9 (patch) | |
tree | 4beee0533c06469c7d12d2493f59b0add009c75e /debian/patches/debian/0006-readlink-path.patch | |
parent | Adding upstream version 4.3. (diff) | |
download | mdadm-2c958b35ba11c61dd2b7416d2f6067655512d2b9.tar.xz mdadm-2c958b35ba11c61dd2b7416d2f6067655512d2b9.zip |
Adding debian version 4.3-1.debian/4.3-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/debian/0006-readlink-path.patch')
-rw-r--r-- | debian/patches/debian/0006-readlink-path.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/debian/0006-readlink-path.patch b/debian/patches/debian/0006-readlink-path.patch new file mode 100644 index 0000000..71ac02a --- /dev/null +++ b/debian/patches/debian/0006-readlink-path.patch @@ -0,0 +1,23 @@ +Author: Michael Tokarev <mjt@tls.msk.ru> +Description: readlink and basename are in /bin not /usr/bin on debian (Closes: #766416). + This is a debian-specific change, upstream ships + the rule to use /usr/bin/$foo while on debian + it is /bin/$foo + +diff -Naurp mdadm.orig/udev-md-raid-arrays.rules mdadm/udev-md-raid-arrays.rules +--- mdadm.orig/udev-md-raid-arrays.rules ++++ mdadm/udev-md-raid-arrays.rules +@@ -37,9 +37,9 @@ ENV{ID_FS_USAGE}=="filesystem|other", EN + 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}=="?*", 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}=="?*", 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" |