Skip to content

Commit

Permalink
fix fast reboot compatibility (#3083)
Browse files Browse the repository at this point in the history
* fix fast reboot compatibility

We should handle both cases for backward-compatible with 201803:
 - fast-reboot
 - SONIC_BOOT_TYPE=fast-reboot

* handle review comments
* add a comment that getBootType code snippet is shared between two files
  • Loading branch information
stepanblyschak authored and yxieca committed Jul 10, 2019
1 parent cf4ab3e commit c932302
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions files/build_templates/docker_image_ctl.j2
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ start() {
echo "Creating new {{docker_container_name}} container"
{%- else %}
echo "Creating new {{docker_container_name}} container with HWSKU $HWSKU"
{%- endif %}
{%- if sonic_asic_platform == "mellanox" %}
# TODO: Mellanox will remove the --tmpfs exception after SDK socket path changed in new SDK version
{%- endif %}
docker create {{docker_image_run_opt}} \
{%- if '--log-driver=json-file' in docker_image_run_opt or '--log-driver' not in docker_image_run_opt %}
Expand Down

0 comments on commit c932302

Please sign in to comment.