From: Dimitri John Ledkov Date: Mon, 23 Jul 2018 10:46:03 +0000 (+0100) Subject: udev.rules: make safe timeouts compatible with split-usr systems. X-Git-Tag: mdadm-4.1-rc2~3 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=18552ef041221d79a30c69d22bc2b68f1c216e97 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 Signed-off-by: Jes Sorensen --- 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"