matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[dhcp_relay] Only attempt to start 'isc-dhcp-relay' group if it is not empty (#1713)

Browse Source
This commit is contained in:
Joe LeVeque 2018-05-16 14:32:42 -07:00 committed by GitHub
parent 76d9de5d8e
commit 6b8e340558
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dockers/docker-dhcp-relay/start.sh
View File

@ -6,13 +6,16 @@ rm -f /var/run/rsyslogd.pid
# Start rsyslog # Start rsyslog
supervisorctl start rsyslogd supervisorctl start rsyslogd
# If our supervisor config has entries in the "isc-dhcp-relay" group...
if [ $(supervisorctl status | grep -c "^isc-dhcp-relay:") -gt 0 ]; then
# Wait for all interfaces to come up and be assigned IPv4 addresses before # Wait for all interfaces to come up and be assigned IPv4 addresses before
# starting the DHCP relay agent(s). If an interface the relay should listen # starting the DHCP relay agent(s). If an interface the relay should listen
# on is down, the relay agent will not start. If an interface the relay should # on is down, the relay agent will not start. If an interface the relay
# listen on is up but does not have an IP address assigned when the relay # should listen on is up but does not have an IP address assigned when the
# agent starts, it will not listen or send on that interface for the lifetime # relay agent starts, it will not listen or send on that interface for the
# of the process. # lifetime of the process.
/usr/bin/wait_for_intf.sh /usr/bin/wait_for_intf.sh
# Start the DHCP relay agent(s) # Start all DHCP relay agent(s)
supervisorctl start isc-dhcp-relay:* supervisorctl start isc-dhcp-relay:*
fi