diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-05-12 12:53:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-05-12 12:53:57 +0000 |
| commit | 342ee7c5a1945aa9978acac8707a538373217372 (patch) | |
| tree | 41246f4a74e24e41c0218dbb6f0d3b77406241c0 | |
| parent | Merging upstream version 4.2+20230508. (diff) | |
| download | mdadm-342ee7c5a1945aa9978acac8707a538373217372.tar.xz mdadm-342ee7c5a1945aa9978acac8707a538373217372.zip | |
Refreshing and updating readlink-path.patch to cover basename too.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/patches/debian/0006-readlink-path.patch | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/debian/patches/debian/0006-readlink-path.patch b/debian/patches/debian/0006-readlink-path.patch index a1eeb23..71ac02a 100644 --- a/debian/patches/debian/0006-readlink-path.patch +++ b/debian/patches/debian/0006-readlink-path.patch @@ -1,18 +1,23 @@ Author: Michael Tokarev <mjt@tls.msk.ru> -Description: readlink is in /bin not /usr/bin on debian (Closes: #766416). +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/readlink while on debian - it is /bin/readlink + 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,7 +37,7 @@ ENV{ID_FS_USAGE}=="filesystem|other", EN +@@ -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}=="?*", 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_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" |