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

fix fast reboot compatibility (#3083)

Browse Source 
* 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
This commit is contained in:
Stepan Blyshchak 2019-06-26 22:46:58 +03:00 committed by Ying Xie
parent cf4ab3e646
commit c932302892
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/build_templates/docker_image_ctl.j2
View File

@ -134,6 +134,9 @@ start() {
echo "Creating new {{docker_container_name}} container" echo "Creating new {{docker_container_name}} container"
{%- else %} {%- else %}
echo "Creating new {{docker_container_name}} container with HWSKU $HWSKU" 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 %} {%- endif %}
docker create {{docker_image_run_opt}} \ 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 %} {%- if '--log-driver=json-file' in docker_image_run_opt or '--log-driver' not in docker_image_run_opt %}