matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28366cd0ce
sonic-buildimage/dockers/docker-router-advertiser/docker-init.sh

14 lines
553 B
Bash
Raw Normal View History

[docker-radvd]: use service dependency in supervisord to start services
2020-05-14 23:05:35 -05:00
#!/usr/bin/env bash
mkdir -p /etc/supervisor/conf.d
sonic-cfggen -d -t /usr/share/sonic/templates/docker-router-advertiser.supervisord.conf.j2 > /etc/supervisor/conf.d/supervisord.conf
# Generate /etc/radvd.conf config file
sonic-cfggen -d -t /usr/share/sonic/templates/radvd.conf.j2 > /etc/radvd.conf
# Generate the script that waits for pertinent interfaces to come up and make it executable
[docker-radv] Fix startup issues (#5230) **- Why I did it** PR https://github.com/Azure/sonic-buildimage/pull/4599 introduced two bugs in the startup of the router advertiser container: 1. References to the `wait_for_intf.sh` script were changed to `wait_for_link.sh`, but the actual script was not renamed 2. The `ipv6_found` Jinja2 variable added to the supervisor config file goes out of scope before it is read. **- How I did it** 1. Rename the `wait_for_intf.sh` script to `wait_for_link.sh` 2. Use the Jinja2 "namespace" construct to fix the scope issue **- How to verify it** Ensure all processes in the radv container start properly under the correct conditions (i.e., whether or not there is at least one VLAN with an IPv6 address assigned).
2020-08-21 15:12:01 -05:00
sonic-cfggen -d -t /usr/share/sonic/templates/wait_for_link.sh.j2 > /usr/bin/wait_for_link.sh
chmod +x /usr/bin/wait_for_link.sh
[docker-radvd]: use service dependency in supervisord to start services
2020-05-14 23:05:35 -05:00
exec /usr/bin/supervisord
Reference in New Issue Copy Permalink