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

diff --git a/target/linux/adm5120/base-files/lib/upgrade/platform.sh b/target/linux/adm5120/base-files/lib/upgrade/platform.sh
index fab2b3d7950ff5ae2a1b514396b510af5ae8410f..b874a5e99238121ec74f58a3029e9caf063455be 100644 (file)
--- 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 5d2eee4ca35ea9fbd990f0247e691875f30618bb..a45af7d0540c998847ce6318ee6ac2e266ab8445 100755 (executable)
--- 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 8f56d1a8f60abbfd719e6bcf40416a4d98542e1b..2e7d298ec2b82a00d370dba11da3c57a824411cd 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -849,13 +849,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 1a9d151c8a282bd6fde26ffda4a218c5c975ace5..7beb4a0d0600b04ea682a3a235ef117685add7f8 100644 (file)
--- 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 4efa47dee078bde4f8dd8b36e953466b80b7a12c..aa98b472444e2cbbd1534e61b3158f0cc1d44c78 100644 (file)
--- 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 e1e43cf19ab3d0310b2b039776f179599b05b83d..92eeaffef635c6cb26d5e8e9929ec159ac9085ee 100644 (file)
--- 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 77b3868dc056cc10007f3dd7a8a0f817854b993c..9755dc40b20c215e08eaca54e462fb3586055570 100755 (executable)
--- 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 67e8324c2aa84032d226efcb85018beedebee1b2..1108b3fd6ed9366e8138f0d9df31ed1a44c42ba3 100755 (executable)
--- 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 8241d1edcf913f3997bae63cefac6c03d18a44c1..fdc94d3e8e48094e83ff17b42fd6017091f0f0be 100755 (executable)
--- 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 6652e14f19df8b298bfc5aefcb4a8672152f1954..8c2e34762acb64ee53ade52f18fe581103f2718c 100644 (file)
--- 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 ab538db108c186c5f4433353dee9e3aa0fb13575..fd0198263e92ab5aca80965fc112e43a1933cd7c 100755 (executable)
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -324,17 +324,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