summaryrefslogtreecommitdiff
path: root/debian/patches/0001-udev.rules-make-safe-timeouts-compatible-with-split-.patch
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2019-01-15 18:40:20 +0000
committerDimitri John Ledkov <xnox@ubuntu.com>2019-01-15 18:41:08 +0000
commitada795fa8e7b1e27c134fe7d5aedf4517cd082f5 (patch)
tree5717f98c75f6b1a9fbae50b88c35f13d07993226 /debian/patches/0001-udev.rules-make-safe-timeouts-compatible-with-split-.patch
parent88ee7cfa1e00aabcfc8f48b57f4b226e7b5c2158 (diff)
New upstream release
* New upstream release * Cherrypick patches from master up to 757e55435997e355ee9b03e5d913b5496a3c39a8.
Diffstat (limited to 'debian/patches/0001-udev.rules-make-safe-timeouts-compatible-with-split-.patch')
-rw-r--r--debian/patches/0001-udev.rules-make-safe-timeouts-compatible-with-split-.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/debian/patches/0001-udev.rules-make-safe-timeouts-compatible-with-split-.patch b/debian/patches/0001-udev.rules-make-safe-timeouts-compatible-with-split-.patch
deleted file mode 100644
index 13613eff..00000000
--- a/debian/patches/0001-udev.rules-make-safe-timeouts-compatible-with-split-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5ebc0b0d96e740bfaa0b514ad25425f84868328a Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <xnox@ubuntu.com>
-Date: Mon, 23 Jul 2018 11:43:04 +0100
-Subject: [PATCH] udev.rules: make safe timeouts compatible with split-usr
- systems.
-
-Instead of /usr/bin/sh, and /usr/bin/echo, use /bin/sh and shell
-built-in echo respectively. This makes
-udev-md-raid-safe-timeouts.rules to be compatible with both usr-merged
-and split-usr systems alike.
-
-Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
----
- udev-md-raid-safe-timeouts.rules | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/udev-md-raid-safe-timeouts.rules b/udev-md-raid-safe-timeouts.rules
-index 420c8626..13c23d84 100644
---- a/udev-md-raid-safe-timeouts.rules
-+++ b/udev-md-raid-safe-timeouts.rules
-@@ -55,7 +55,7 @@ ACTION=="add|change", \
- ENV{MD_LEVEL}=="raid[1-9]*", \
- TEST=="/sys/block/$parent/device/timeout", \
- TEST=="/usr/sbin/smartctl", \
-- PROGRAM!="/usr/bin/sh -c '/usr/sbin/smartctl -l scterc /dev/$parent | grep -q seconds && exit 0 || exit 1'", \
-- RUN+="/usr/bin/sh -c '/usr/bin/echo 180 > /sys/block/$parent/device/timeout && /usr/bin/logger timeout for /dev/$parent set to 180 secs'"
-+ PROGRAM!="/bin/sh -c '/usr/sbin/smartctl -l scterc /dev/$parent | grep -q seconds && exit 0 || exit 1'", \
-+ RUN+="/bin/sh -c 'echo 180 > /sys/block/$parent/device/timeout && /usr/bin/logger timeout for /dev/$parent set to 180 secs'"
-
- LABEL="md_timeouts_end"
---
-2.17.1
-