summaryrefslogtreecommitdiff
path: root/debian/patches/0001-udev.rules-make-safe-timeouts-compatible-with-split-.patch
blob: 13613eff8cf53a57d9e7a163583b42a660329c8d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
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