[openwrt/openwrt] ath79: sysupgrade: remove obsolete sysupgrade watchdog kill

LEDE Commits lede-commits at lists.infradead.org
Wed May 16 22:47:13 PDT 2018


mkresin pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/377197fdb390370169d7b23829b0f4637f623840

commit 377197fdb390370169d7b23829b0f4637f623840
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Mon May 7 20:51:13 2018 +0200

    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 at kresin.me>
---
 target/linux/ath79/base-files/lib/upgrade/platform.sh | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh
index b2b55e6..88c0941 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



More information about the lede-commits mailing list