treewide: remove obsolete sysupgrade watchdog kill
authorMathias Kresin <dev@kresin.me>
Mon, 18 Dec 2017 17:42:49 +0000 (18:42 +0100)
committerMathias Kresin <dev@kresin.me>
Fri, 16 Feb 2018 13:44:02 +0000 (14:44 +0100)
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>
target/linux/adm5120/base-files/lib/upgrade/platform.sh
target/linux/apm821xx/base-files/lib/upgrade/platform.sh
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/au1000/base-files/lib/upgrade/platform.sh
target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
target/linux/lantiq/base-files/lib/upgrade/platform.sh
target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
target/linux/mvebu/base-files/lib/upgrade/platform.sh
target/linux/oxnas/base-files/lib/upgrade/platform.sh
target/linux/ramips/base-files/lib/upgrade/platform.sh

index fab2b3d..b874a5e 100644 (file)
@@ -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
index 5d2eee4..a45af7d 100755 (executable)
@@ -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
index 8f56d1a..2e7d298 100755 (executable)
@@ -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
index 1a9d151..7beb4a0 100644 (file)
@@ -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
index 4efa47d..aa98b47 100644 (file)
@@ -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
index e1e43cf..92eeaff 100644 (file)
@@ -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
index 77b3868..9755dc4 100755 (executable)
@@ -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
index 67e8324..1108b3f 100755 (executable)
@@ -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
index 8241d1e..fdc94d3 100755 (executable)
@@ -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
index 6652e14..8c2e347 100644 (file)
@@ -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
index ab538db..fd01982 100755 (executable)
@@ -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