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 df7ce9301a
("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>
			
			
This commit is contained in:
		@@ -33,12 +33,3 @@ platform_do_upgrade() {
 | 
				
			|||||||
	PART_NAME="$sys_mtd_part"
 | 
						PART_NAME="$sys_mtd_part"
 | 
				
			||||||
	default_do_upgrade "$ARGV"
 | 
						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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,13 +61,3 @@ platform_copy_config() {
 | 
				
			|||||||
		;;
 | 
							;;
 | 
				
			||||||
	esac
 | 
						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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -849,13 +849,3 @@ platform_do_upgrade() {
 | 
				
			|||||||
		;;
 | 
							;;
 | 
				
			||||||
	esac
 | 
						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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,13 +24,3 @@ platform_do_upgrade() {
 | 
				
			|||||||
	get_image "$1" | tar -Oxvf - $KERNEL_IMG | mtd write - "kernel"
 | 
						get_image "$1" | tar -Oxvf - $KERNEL_IMG | mtd write - "kernel"
 | 
				
			||||||
	get_image "$1" | tar -Oxvf - $ROOTFS_IMG | mtd $conf write - "rootfs"
 | 
						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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,15 +17,3 @@ platform_check_image() {
 | 
				
			|||||||
platform_do_upgrade() {
 | 
					platform_do_upgrade() {
 | 
				
			||||||
	default_do_upgrade "$ARGV"
 | 
						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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -135,15 +135,3 @@ platform_do_upgrade() {
 | 
				
			|||||||
		;;
 | 
							;;
 | 
				
			||||||
	esac
 | 
						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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,12 +16,3 @@ platform_pre_upgrade() {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# use default for platform_do_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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,13 +10,3 @@ platform_check_image() {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# use default for platform_do_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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,13 +34,3 @@ platform_copy_config() {
 | 
				
			|||||||
		;;
 | 
							;;
 | 
				
			||||||
	esac
 | 
						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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,13 +16,3 @@ platform_check_image() {
 | 
				
			|||||||
platform_pre_upgrade() {
 | 
					platform_pre_upgrade() {
 | 
				
			||||||
	nand_do_upgrade $1
 | 
						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
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -324,17 +324,8 @@ platform_do_upgrade() {
 | 
				
			|||||||
	esac
 | 
						esac
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
disable_watchdog() {
 | 
					 | 
				
			||||||
	killall watchdog
 | 
					 | 
				
			||||||
	( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
 | 
					 | 
				
			||||||
		echo 'Could not disable watchdog'
 | 
					 | 
				
			||||||
		return 1
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
blink_led() {
 | 
					blink_led() {
 | 
				
			||||||
	. /etc/diag.sh; set_state upgrade
 | 
						. /etc/diag.sh; set_state upgrade
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
append sysupgrade_pre_upgrade disable_watchdog
 | 
					 | 
				
			||||||
append sysupgrade_pre_upgrade blink_led
 | 
					append sysupgrade_pre_upgrade blink_led
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user