From ffad2e38027eef3cb5e8ca8847a73a00a57e4d6b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 25 Feb 2023 18:52:36 +0100 Subject: Refreshing readlink-path.patch. Signed-off-by: Daniel Baumann --- debian/patches/debian/0006-readlink-path.patch | 18 ++++++++++++++++++ debian/patches/readlink-path.patch | 21 --------------------- debian/patches/series | 2 +- 3 files changed, 19 insertions(+), 22 deletions(-) create mode 100644 debian/patches/debian/0006-readlink-path.patch delete mode 100644 debian/patches/readlink-path.patch diff --git a/debian/patches/debian/0006-readlink-path.patch b/debian/patches/debian/0006-readlink-path.patch new file mode 100644 index 0000000..a1eeb23 --- /dev/null +++ b/debian/patches/debian/0006-readlink-path.patch @@ -0,0 +1,18 @@ +Author: Michael Tokarev +Description: readlink is 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 + +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 + 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_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" + diff --git a/debian/patches/readlink-path.patch b/debian/patches/readlink-path.patch deleted file mode 100644 index 0b1ad6c..0000000 --- a/debian/patches/readlink-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Michael Tokarev -Subject: readlink is in /bin not /usr/bin on debian -Date: Fri, 14 Nov 2014 19:11:51 +0300 -Bug-Debian: http://bugs.debian.org/766416 -Forwarded: no - -This is a debian-specific change, upstream ships -the rule to use /usr/bin/readlink while on debian -it is /bin/readlink - ---- a/udev-md-raid-arrays.rules -+++ b/udev-md-raid-arrays.rules -@@ -37,7 +37,7 @@ 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_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" - diff --git a/debian/patches/series b/debian/patches/series index 7d1ea02..b07b693 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,6 @@ debian/0002-mdmonitor-service-simplify.patch debian/0003-host-name-in-default-mailfrom.patch debian/0004-exit-gracefully-when-md-device-not-found.patch debian/0005-sha1-includes.patch -readlink-path.patch +debian/0006-readlink-path.patch debian-no-Werror.diff test-installed.patch -- cgit v1.2.3