diff --git a/debian/patches/debian/0005-readlink-path.patch b/debian/patches/debian/0005-readlink-path.patch deleted file mode 100644 index 71ac02a..0000000 --- a/debian/patches/debian/0005-readlink-path.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Michael Tokarev -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" diff --git a/debian/patches/series b/debian/patches/series index 3136e99..847d08b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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