From aa6d353cb5f4ebce1fc4d98fd19a8a7fccac18c6 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Fri, 14 Nov 2014 19:13:51 +0300 Subject: readlink-path.patch: readlink is in /bin not /usr/bin on debian (766416) --- debian/changelog | 2 ++ debian/patches/readlink-path.patch | 15 +++++++++++++++ debian/patches/series | 1 + 3 files changed, 18 insertions(+) create mode 100644 debian/patches/readlink-path.patch diff --git a/debian/changelog b/debian/changelog index 8aefbb95..8bd8233f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ mdadm (3.3.2-3) UNRELEASED; urgency=low nodes after assembling arrays (eg, when switching from initramfs without preserving /dev and /run), to choose the same device names as when doing inital assembly + * readlink-path.patch: readlink is in /bin not /usr/bin on debian + (Closes: #766416) -- Michael Tokarev Mon, 06 Oct 2014 11:28:42 +0400 diff --git a/debian/patches/readlink-path.patch b/debian/patches/readlink-path.patch new file mode 100644 index 00000000..86544592 --- /dev/null +++ b/debian/patches/readlink-path.patch @@ -0,0 +1,15 @@ +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 +@@ -38 +38 @@ ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service" +-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" diff --git a/debian/patches/series b/debian/patches/series index 6132de5c..5b7bda85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ sha1-includes.diff use-external-blkid.diff build-sys-no-check_rundir.patch rebuildmap-strip-local-host-name-from-device-name.patch +readlink-path.patch -- cgit v1.2.3