Skip to content
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

Fix for issue#574 onie-discovery-stop does not kill the entire discov… #829

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for issue#574 onie-discovery-stop does not kill the entire discov… #829

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
1 change: 1 addition & 0 deletions rootconf/default/etc/init.d/discover.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ do_stop() {
log_begin_msg "Stopping: $daemon"
start-stop-daemon -q -K -s TERM -p /var/run/${daemon}.pid
killall -q $onie_installer exec_installer wget tftp
pkill -P $(cat /var/run/${daemon}.pid)
log_end_msg
}

Expand Down
6 changes: 6 additions & 0 deletions rootconf/default/etc/init.d/networking.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ config_ethmgmt_fallback()
local intf=$1
shift

local ipaddr=$(ifconfig $intf |grep 'inet '|sed -e 's/:/ /g'|awk '{ print $3 " / " $7 }')
if [ -n "$ipaddr" ] ; then
log_console_msg "Found already assigned IP address $ipaddr to $intf"
return 0
fi

# Remove any previously configured, IPv4 addresses
ip -f inet addr flush dev $intf

Expand Down