[source] base-files: upgrade: don't loop forever trying to kill processes
LEDE Commits
lede-commits at lists.infradead.org
Thu Jul 20 12:44:06 PDT 2017
neoraider pushed a commit to source.git, branch master:
https://git.lede-project.org/1ab227d68852c1cb869926057774540bded24d41
commit 1ab227d68852c1cb869926057774540bded24d41
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Thu Jul 13 00:19:32 2017 +0200
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 <mschiffer at universe-factory.net>
---
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 5a439f1..d7f92a4 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() { # [ <signal> [ <loop> ] ]
+ local loop_limit=10
+
local sig="${1:-TERM}"
local loop="${2:-0}"
local run=true
@@ -108,8 +110,15 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
[ $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
}
More information about the lede-commits
mailing list