From 1ab227d68852c1cb869926057774540bded24d41 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 13 Jul 2017 00:19:32 +0200 Subject: [PATCH] base-files: upgrade: don't loop forever trying to kill processes When processes don't die on SIGKILL (usually because of kernel bugs), it's better to give up instead of looping forever. upgraded will trigger a reboot in this case (and if this fails, a hardware watchdog will eventually time out and reset the system, if present). Signed-off-by: Matthias Schiffer --- package/base-files/files/lib/upgrade/stage2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index 5a439f1201..d7f92a4f35 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -78,6 +78,8 @@ switch_to_ramfs() { } kill_remaining() { # [ [ ] ] + local loop_limit=10 + local sig="${1:-TERM}" local loop="${2:-0}" local run=true @@ -108,8 +110,15 @@ kill_remaining() { # [ [ ] ] [ $loop -eq 1 ] && run=true done + + let loop_limit-- + [ $loop_limit -eq 0 ] && { + echo + echo "Failed to kill all processes." + exit 1 + } done - echo "" + echo }