From 07ba66524c4735286c71eafb3f299e5bc2c1e0f0 Mon Sep 17 00:00:00 2001 From: Harish Venkatraman Date: Tue, 20 Mar 2018 15:38:59 -0700 Subject: [PATCH] [sonic-buildimage] Updating module sai-redis Updating the sonic-sairedis point. Signed-off-by: Harish Venkatraman --- .../Force10-S6100/sai.profile.j2 | 8 ++++---- platform/broadcom/docker-syncd-brcm/start.sh | 1 - src/sonic-sairedis | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/sai.profile.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/sai.profile.j2 index ca2dcc2f59d1..92cda77668f6 100644 --- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/sai.profile.j2 +++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/sai.profile.j2 @@ -2,12 +2,12 @@ {%- if DEVICE_METADATA is defined -%} {%- set switch_role = DEVICE_METADATA['localhost']['type'] -%} {%- if switch_role.lower() == 'torrouter' %} -{% set sai_profile_filename = 'SAI_INIT_CONFIG_FILE=/etc/bcm/th-s6100-64x40G-t0.config.bcm' -%} +{% set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/etc/bcm/th-s6100-64x40G-t0.config.bcm' -%} {%- else %} -{%- set sai_profile_filename = 'SAI_INIT_CONFIG_FILE=/etc/bcm/th-s6100-64x40G-t1.config.bcm' -%} +{%- set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/etc/bcm/th-s6100-64x40G-t1.config.bcm' -%} {%- endif %} {%- else %} -{%- set sai_profile_filename = 'SAI_INIT_CONFIG_FILE=/etc/bcm/th-s6100-64x40G-t1.config.bcm' -%} +{%- set sai_profile_contents = 'SAI_INIT_CONFIG_FILE=/etc/bcm/th-s6100-64x40G-t1.config.bcm' -%} {%- endif %} {# Write the contents of sai_ profile_filename to sai.profile file #} -{{ sai_profile_filename }} +{{ sai_profile_contents }} diff --git a/platform/broadcom/docker-syncd-brcm/start.sh b/platform/broadcom/docker-syncd-brcm/start.sh index 69c925ea3a11..d2180bce1ed7 100755 --- a/platform/broadcom/docker-syncd-brcm/start.sh +++ b/platform/broadcom/docker-syncd-brcm/start.sh @@ -5,7 +5,6 @@ HWSKU_DIR=/usr/share/sonic/hwsku rm -f /var/run/rsyslogd.pid - supervisorctl start rsyslogd mkdir -p /etc/sai.d/ diff --git a/src/sonic-sairedis b/src/sonic-sairedis index e9ad72132f09..d35642238905 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit e9ad72132f09f37418b9ecd9d0c6708afac6db6f +Subproject commit d35642238905ae4e9a0d259797b578eddd5a7156