From 319ca976d23c8cb21563d418be6dab4828e35c6c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 14 Feb 2025 06:02:02 +0100 Subject: [PATCH] Refreshing readlink-path.patch. Signed-off-by: Daniel Baumann --- .../0006-readlink-path.patch} | 19 ++++++++----------- debian/patches/series | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) rename debian/patches/{readlink-path.patch => debian/0006-readlink-path.patch} (63%) diff --git a/debian/patches/readlink-path.patch b/debian/patches/debian/0006-readlink-path.patch similarity index 63% rename from debian/patches/readlink-path.patch rename to debian/patches/debian/0006-readlink-path.patch index 0b1ad6c..a1eeb23 100644 --- a/debian/patches/readlink-path.patch +++ b/debian/patches/debian/0006-readlink-path.patch @@ -1,15 +1,12 @@ -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 +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 -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 +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" 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