diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2020-01-15 21:41:32 +0100 |
|---|---|---|
| committer | Mike Frysinger <vapier@gmail.com> | 2021-09-09 22:57:44 -0400 |
| commit | d87f5b2f24e5c521cbe410df17289e25477e45ac (patch) | |
| tree | 258789f8930c91b1222e5078867cf074de4c24dd | |
| parent | 25d5de8fd9698fed0fdbbd8949fd4089602b796d (diff) | |
rc-mount: make timeout invocation compatible with busybox timeout
Busybox timeout does not support the `-k` flag. As such, invoking fuser
from do_unmount never worked without this patch. This went unnoticed as
standard error is redirected to /dev/null. This patch fixes this by
simply removing the incompatible `-k` flag.
[Ariadne: the `-k` is redundant anyway, since we are sending the KILL
signal to begin with.]
| -rw-r--r-- | sh/rc-mount.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh index f443d4c5..b640541f 100644 --- a/sh/rc-mount.sh +++ b/sh/rc-mount.sh @@ -48,7 +48,7 @@ do_unmount() retry=4 # Effectively TERM, sleep 1, TERM, sleep 1, KILL, sleep 1 while ! LC_ALL=C $cmd "$mnt" 2>/dev/null; do if command -v fuser >/dev/null 2>&1; then - pids="$(timeout -k 10 -s KILL "${rc_fuser_timeout:-60}" \ + pids="$(timeout -s KILL "${rc_fuser_timeout:-60}" \ fuser $f_opts "$mnt" 2>/dev/null)" fi case " $pids " in |