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 <d...@kresin.me>
---
target/linux/adm5120/base-files/lib/upgrade/platform.sh | 9 ---------
target/linux/apm821xx/base-files/lib/upgrade/platform.sh | 10 ----------
target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 10 ----------
target/linux/au1000/base-files/lib/upgrade/platform.sh | 10 ----------
target/linux/cns3xxx/base-files/lib/upgrade/platform.sh | 12 ------------
target/linux/ixp4xx/base-files/lib/upgrade/platform.sh | 12 ------------
target/linux/lantiq/base-files/lib/upgrade/platform.sh | 9 ---------
target/linux/mpc85xx/base-files/lib/upgrade/platform.sh | 10 ----------
target/linux/mvebu/base-files/lib/upgrade/platform.sh | 10 ----------
target/linux/oxnas/base-files/lib/upgrade/platform.sh | 10 ----------
target/linux/ramips/base-files/lib/upgrade/platform.sh | 9 ---------
11 files changed, 111 deletions(-)
diff --git a/target/linux/adm5120/base-files/lib/upgrade/platform.sh
b/target/linux/adm5120/base-files/lib/upgrade/platform.sh
index fab2b3d..b874a5e 100644
--- a/target/linux/adm5120/base-files/lib/upgrade/platform.sh
+++ b/target/linux/adm5120/base-files/lib/upgrade/platform.sh
@@ -33,12 +33,3 @@ platform_do_upgrade() {
PART_NAME="$sys_mtd_part"
default_do_upgrade "$ARGV"
}
-
-disable_watchdog() {
- killall watchdog
- ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
- echo 'Could not disable watchdog'
- return 1
- }
-}
-append sysupgrade_pre_upgrade disable_watchdog
diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
index 5d2eee4..a45af7d 100755
--- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
@@ -61,13 +61,3 @@ platform_copy_config() {
;;
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
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index ecf6820..35c6886 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -834,13 +834,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
diff --git a/target/linux/au1000/base-files/lib/upgrade/platform.sh
b/target/linux/au1000/base-files/lib/upgrade/platform.sh
index 1a9d151..7beb4a0 100644
--- a/target/linux/au1000/base-files/lib/upgrade/platform.sh
+++ b/target/linux/au1000/base-files/lib/upgrade/platform.sh
@@ -24,13 +24,3 @@ platform_do_upgrade() {
get_image "$1" | tar -Oxvf - $KERNEL_IMG | mtd write - "kernel"
get_image "$1" | tar -Oxvf - $ROOTFS_IMG | mtd $conf write - "rootfs"
}
-
-disable_watchdog() {
- killall watchdog
- ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
- echo 'Could not disable watchdog'
- return 1
- }
-}
-
-append sysupgrade_pre_upgrade disable_watchdog
diff --git a/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
b/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
index 4efa47d..aa98b47 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
diff --git a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
index e1e43cf..92eeaff 100644
--- a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
@@ -135,15 +135,3 @@ platform_do_upgrade() {
;;
esac
}
-
-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
diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh
b/target/linux/lantiq/base-files/lib/upgrade/platform.sh
index 77b3868..9755dc4 100755
--- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh
+++ b/target/linux/lantiq/base-files/lib/upgrade/platform.sh
@@ -16,12 +16,3 @@ platform_pre_upgrade() {
}
# use default for platform_do_upgrade()
-
-disable_watchdog() {
- killall watchdog
- ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
- echo 'Could not disable watchdog'
- return 1
- }
-}
-append sysupgrade_pre_upgrade disable_watchdog
diff --git a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
index 67e8324..1108b3f 100755
--- a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
@@ -10,13 +10,3 @@ platform_check_image() {
}
# use default for platform_do_upgrade()
-
-disable_watchdog() {
- killall watchdog
- ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
- echo 'Could not disable watchdog'
- return 1
- }
-}
-
-append sysupgrade_pre_upgrade disable_watchdog
diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
index 8241d1e..fdc94d3 100755
--- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
@@ -34,13 +34,3 @@ platform_copy_config() {
;;
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
diff --git a/target/linux/oxnas/base-files/lib/upgrade/platform.sh
b/target/linux/oxnas/base-files/lib/upgrade/platform.sh
index 6652e14..8c2e347 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
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh
b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 8160f5d..7003880 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -321,17 +321,8 @@ platform_do_upgrade() {
esac
}
-disable_watchdog() {
- killall watchdog
- ( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
- echo 'Could not disable watchdog'
- return 1
- }
-}
-
blink_led() {
. /etc/diag.sh; set_state upgrade
}
-append sysupgrade_pre_upgrade disable_watchdog
append sysupgrade_pre_upgrade blink_led
--
2.7.4
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
