From: Mathias Kresin <dev@kresin.me>
Date: Mon, 7 May 2018 18:51:13 +0000 (+0200)
Subject: ath79: sysupgrade: remove obsolete sysupgrade watchdog kill
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=377197fdb390370169d7b23829b0f4637f623840;p=openwrt%2Fstaging%2Fblogic.git

ath79: sysupgrade: 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 <dev@kresin.me>
---

diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh
index b2b55e64e33d..88c09410e78f 100644
--- a/target/linux/ath79/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ath79/base-files/lib/upgrade/platform.sh
@@ -212,13 +212,3 @@ platform_do_upgrade() {
 		;;
 	esac
 }
-
-disable_watchdog() {
-	killall watchdog
-	( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
-		echo 'Could not disable watchdog'
-		return 1
-	}
-}
-
-append sysupgrade_pre_upgrade disable_watchdog