Skip to content

watchcat: passing the interface in the ping_reboot #27969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anagno wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

watchcat: passing the interface in the ping_reboot #27969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion utils/watchcat/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=watchcat
PKG_VERSION:=1
PKG_RELEASE:=17
PKG_RELEASE:=18

PKG_MAINTAINER:=Roger D <[email protected]>
PKG_LICENSE:=GPL-2.0
Expand Down
2 changes: 1 addition & 1 deletion utils/watchcat/files/watchcat.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ config_watchcat() {
;;
ping_reboot)
procd_open_instance "watchcat_${1}"
procd_set_param command /usr/bin/watchcat.sh "ping_reboot" "$period" "$forcedelay" "$pinghosts" "$pingperiod" "$pingsize" "$addressfamily"
procd_set_param command /usr/bin/watchcat.sh "ping_reboot" "$period" "$forcedelay" "$pinghosts" "$pingperiod" "$pingsize" "$addressfamily" "$interface"
procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
procd_close_instance
;;
Expand Down
5 changes: 3 additions & 2 deletions utils/watchcat/files/watchcat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ watchcat_ping() {
ping_frequency_interval="$4"
ping_size="$5"
address_family="$6"
iface="$7"

time_now="$(cat /proc/uptime)"
time_now="${time_now%%.*}"
Expand Down Expand Up @@ -252,8 +253,8 @@ periodic_reboot)
watchcat_periodic "$2" "$3"
;;
ping_reboot)
# args from init script: period forcedelay pinghosts pingperiod pingsize addressfamily
watchcat_ping "$2" "$3" "$4" "$5" "$6" "$7"
# args from init script: period forcedelay pinghosts pingperiod pingsize addressfamily interface
watchcat_ping "$2" "$3" "$4" "$5" "$6" "$7" "$8"
;;
restart_iface)
# args from init script: period pinghosts pingperiod pingsize interface mmifacename unlockbands addressfamily
Expand Down