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/oxnas/base-files/lib/upgrade/platform.sh | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'target/linux/oxnas') diff --git a/target/linux/oxnas/base-files/lib/upgrade/platform.sh b/target/linux/oxnas/base-files/lib/upgrade/platform.sh index 6652e14f19..8c2e34762a 100644 --- a/target/linux/oxnas/base-files/lib/upgrade/platform.sh +++ b/target/linux/oxnas/base-files/lib/upgrade/platform.sh @@ -16,13 +16,3 @@ platform_check_image() { platform_pre_upgrade() { nand_do_upgrade $1 } - -disable_watchdog() { - killall watchdog - ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && { - echo 'Could not disable watchdog' - return 1 - } -} - -append sysupgrade_pre_upgrade disable_watchdog -- cgit v1.2.3