linux/mdadm
1
0
Fork 0
Code Issues Activity

Removing readlink-path.patch, not needed anymore with usr-merge.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-14 06:38:28 +01:00
parent 8fb350b379
commit 4fd29d18ed
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
2 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
debian/patches/debian/0005-readlink-path.patch vendored
View file

@ -1,23 +0,0 @@
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"

1
debian/patches/series vendored
View file

@ -2,7 +2,6 @@ debian/0001-fix-manpages.patch
debian/0002-host-name-in-default-mailfrom.patch
debian/0003-exit-gracefully-when-md-device-not-found.patch
debian/0004-sha1-includes.patch
debian/0005-readlink-path.patch
debian/0006-no-Werror.patch
debian/0007-test-installed.patch
debian/0008-randomize-timers.patch