Skip to content

Commit

Permalink
[dhcp_relay] Only attempt to start 'isc-dhcp-relay' group if it is no…
Browse files Browse the repository at this point in the history
…t empty (#1713)
  • Loading branch information
jleveque authored May 16, 2018
1 parent 76d9de5 commit 6b8e340
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions dockers/docker-dhcp-relay/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ rm -f /var/run/rsyslogd.pid
# Start rsyslog
supervisorctl start rsyslogd

# 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
# on is down, the relay agent will not start. If an interface the relay should
# listen on is up but does not have an IP address assigned when the relay
# agent starts, it will not listen or send on that interface for the lifetime
# of the process.
/usr/bin/wait_for_intf.sh
# 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
# 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 listen on is up but does not have an IP address assigned when the
# relay agent starts, it will not listen or send on that interface for the
# lifetime of the process.
/usr/bin/wait_for_intf.sh

# Start the DHCP relay agent(s)
supervisorctl start isc-dhcp-relay:*
# Start all DHCP relay agent(s)
supervisorctl start isc-dhcp-relay:*
fi

0 comments on commit 6b8e340

Please sign in to comment.