From c4ac02ffca4e8b9ffe8c702abf4de4063d3097e6 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Mon, 18 Dec 2017 18:42:49 +0100 Subject: treewide: remove obsolete sysupgrade watchdog kill The watchdog kill command was meant for busybox watchdog. Busybox watchdog was replaced by the procd watchdog mid 2013 with commit df7ce9301a25 ("busybox: disable the watchdog utility by default"), which makes the kill command obsolete since quite some time. Signed-off-by: Mathias Kresin --- target/linux/cns3xxx/base-files/lib/upgrade/platform.sh | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'target/linux/cns3xxx/base-files') diff --git a/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh b/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh index 4efa47dee0..aa98b47244 100644 --- a/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh +++ b/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh @@ -17,15 +17,3 @@ platform_check_image() { platform_do_upgrade() { default_do_upgrade "$ARGV" } - -disable_watchdog() { - v "killing watchdog" - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -# CONFIG_WATCHDOG_NOWAYOUT=y - can't kill watchdog unless kernel cmdline has a mpcore_wdt.nowayout=0 -#append sysupgrade_pre_upgrade disable_watchdog -- cgit v1.2.3