a8f5051104
783465d783 odhcpd: don't enable server mode on non-static lan port c92c1894a5 odhcpd: backport fixes from master branch (FS#402, FS#524) 4b4a4af814 dnsmasq: bump to v2.78 b8357e87d7 base-files: create /etc/config/ directory 3350137bd3 sunxi: clean up modules definitions a881323cb2 ltq-vdsl-mei: revert disable optimized firmware download f483a35f08 curl: fix security problems e232c6754d mbedtls: update to 2.6.0 CVE-2017-14032 37e1bd27d0 generic: drop 704-phy-no-genphy-soft-reset.patch 720b0e2e2d kernel: update 4.4 to 4.4.89 b428f45c06 ltq-vdsl-mei: disable optimized firmware download 39e5cd9556 ltq-vdsl: fix PM thread suspend and resume handling 86f0e8b091 openvpn: add "extra-certs" option af802bc687 lantiq: fix missing otg_cap on danube platform 12a0da6315 tcpdump: noop commit to refer CVEs fixed in 4.9.2 f66c6e1d8a tcpdump: bump to 4.9.2 a131f7cb69 utils/tcpdump: Rework URLs 7f1359c14e base-files: fix wan6 interface config generation for pppoe 97ebdf93a3 ipq806x: Archer C2600: fix switch ports numbering d33f7905df treewide: fix shellscript syntax errors/typos 4f162ac3ce ramips: fix hg255d LED status support
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Thu, 13 Jul 2017 00:19:32 +0200
|
|
Subject: 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@universe-factory.net>
|
|
|
|
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
|
|
index bdbb8926643287f48a4ae62c5d1d4b4a29130859..097ad63adfecdd70019acaa5b652d2056e774c3f 100755
|
|
--- a/package/base-files/files/lib/upgrade/stage2
|
|
+++ b/package/base-files/files/lib/upgrade/stage2
|
|
@@ -87,6 +87,8 @@ switch_to_ramfs() {
|
|
}
|
|
|
|
kill_remaining() { # [ <signal> [ <loop> ] ]
|
|
+ local loop_limit=10
|
|
+
|
|
local sig="${1:-TERM}"
|
|
local loop="${2:-0}"
|
|
local run=true
|
|
@@ -117,8 +119,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
|
|
}
|
|
|
|
|