From 3d656cdbecccdacaeb5613ece0033b71343520cd Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Fri, 3 Mar 2017 20:11:16 +0000 Subject: [PATCH 1/2] Add shell scripts to host FS that reference Broadcom exe's inside syncd docker --- files/build_templates/sonic_debian_extension.j2 | 7 +++++++ files/image_config/bin/bcmcmd | 3 +++ files/image_config/bin/dsserve | 3 +++ 3 files changed, 13 insertions(+) create mode 100755 files/image_config/bin/bcmcmd create mode 100755 files/image_config/bin/dsserve diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index c84518576f17..e3e5da7e1fc8 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -172,6 +172,13 @@ sudo dpkg --root=$FILESYSTEM_ROOT -P {{ debname }} sudo rm -f $FILESYSTEM_ROOT/usr/sbin/policy-rc.d +# On Broadcom platforms, copy our shell scripts that reference Broadcom +# executables inside the Broadcom syncd docker +if [ $sonic_asic_platform == "broadcom" ]; then + sudo cp -f $IMAGE_CONFIGS/bin/bcmcmd $FILESYSTEM_ROOT/usr/bin + sudo cp -f $IMAGE_CONFIGS/bin/dsserve $FILESYSTEM_ROOT/usr/bin +fi + ## copy platform rc.local sudo cp $IMAGE_CONFIGS/platform/rc.local $FILESYSTEM_ROOT/etc/ diff --git a/files/image_config/bin/bcmcmd b/files/image_config/bin/bcmcmd new file mode 100755 index 000000000000..7903db6ed6a3 --- /dev/null +++ b/files/image_config/bin/bcmcmd @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -i syncd bcmcmd "$@" diff --git a/files/image_config/bin/dsserve b/files/image_config/bin/dsserve new file mode 100755 index 000000000000..dd00430fda1c --- /dev/null +++ b/files/image_config/bin/dsserve @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -i syncd dsserve "$@" From cc31c67b669fa7032d9fb8dfe2e391705f879c2b Mon Sep 17 00:00:00 2001 From: Joe LeVeque Date: Fri, 3 Mar 2017 22:05:37 +0000 Subject: [PATCH 2/2] Add redis-cli, teamdctl and vtysh. Remove dsserve --- files/build_templates/sonic_debian_extension.j2 | 7 ++++--- files/image_config/bin/dsserve | 3 --- files/image_config/bin/redis-cli | 3 +++ files/image_config/bin/teamdctl | 3 +++ files/image_config/bin/vtysh | 3 +++ 5 files changed, 13 insertions(+), 6 deletions(-) delete mode 100755 files/image_config/bin/dsserve create mode 100755 files/image_config/bin/redis-cli create mode 100755 files/image_config/bin/teamdctl create mode 100755 files/image_config/bin/vtysh diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index e3e5da7e1fc8..95a927d9b998 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -172,12 +172,13 @@ sudo dpkg --root=$FILESYSTEM_ROOT -P {{ debname }} sudo rm -f $FILESYSTEM_ROOT/usr/sbin/policy-rc.d -# On Broadcom platforms, copy our shell scripts that reference Broadcom -# executables inside the Broadcom syncd docker +# Copy shell scripts which reference executables inside dockers if [ $sonic_asic_platform == "broadcom" ]; then sudo cp -f $IMAGE_CONFIGS/bin/bcmcmd $FILESYSTEM_ROOT/usr/bin - sudo cp -f $IMAGE_CONFIGS/bin/dsserve $FILESYSTEM_ROOT/usr/bin fi +sudo cp -f $IMAGE_CONFIGS/bin/redis-cli $FILESYSTEM_ROOT/usr/bin +sudo cp -f $IMAGE_CONFIGS/bin/teamdctl $FILESYSTEM_ROOT/usr/bin +sudo cp -f $IMAGE_CONFIGS/bin/vtysh $FILESYSTEM_ROOT/usr/bin ## copy platform rc.local sudo cp $IMAGE_CONFIGS/platform/rc.local $FILESYSTEM_ROOT/etc/ diff --git a/files/image_config/bin/dsserve b/files/image_config/bin/dsserve deleted file mode 100755 index dd00430fda1c..000000000000 --- a/files/image_config/bin/dsserve +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -docker exec -i syncd dsserve "$@" diff --git a/files/image_config/bin/redis-cli b/files/image_config/bin/redis-cli new file mode 100755 index 000000000000..103dd9e02536 --- /dev/null +++ b/files/image_config/bin/redis-cli @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -it database redis-cli "$@" diff --git a/files/image_config/bin/teamdctl b/files/image_config/bin/teamdctl new file mode 100755 index 000000000000..9dd188d18cba --- /dev/null +++ b/files/image_config/bin/teamdctl @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -i teamd teamdctl "$@" diff --git a/files/image_config/bin/vtysh b/files/image_config/bin/vtysh new file mode 100755 index 000000000000..c479fcd3653b --- /dev/null +++ b/files/image_config/bin/vtysh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -i bgp vtysh "$@"