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

[docker-iccp]: do not mount kernel module into iccp container (#4372)

Browse Source 
kernel module should be loaded outside container

Signed-off-by: Guohan Lu <lguohan@gmail.com>
This commit is contained in:
lguohan 2020-04-06 07:40:24 -07:00 committed by GitHub
parent 60b16495cc
commit 296470de25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
files/build_templates/docker_image_ctl.j2
View File

@ -231,9 +231,6 @@ start() {
{%- if docker_container_name != "database" %} {%- if docker_container_name != "database" %}
-v /usr/share/sonic/device/$PLATFORM/$HWSKU/$DEV:/usr/share/sonic/hwsku:ro \ -v /usr/share/sonic/device/$PLATFORM/$HWSKU/$DEV:/usr/share/sonic/hwsku:ro \
{%- endif %} {%- endif %}
{%- if docker_container_name == "iccpd" %}
-v /lib/modules:/lib/modules:ro \
{%- endif %}
{%- if sonic_asic_platform != "mellanox" %} {%- if sonic_asic_platform != "mellanox" %}
--tmpfs /tmp \ --tmpfs /tmp \
{%- endif %} {%- endif %}
@ -255,7 +252,7 @@ wait() {
stop() { stop() {
docker stop {{docker_container_name}}$DEV docker stop {{docker_container_name}}$DEV
{%- if docker_container_name == "database" %} {%- if docker_container_name == "database" %}
if [ "$DEV" ]; then if [ "$DEV" ]; then
ip netns delete "$NET_NS" ip netns delete "$NET_NS"
fi fi
{%- endif %} {%- endif %}
@ -266,7 +263,7 @@ DEV=$2 # namespace/device number to operate on
if [ "$DEV" ]; then if [ "$DEV" ]; then
NET_NS="asic$DEV" #name of the network namespace NET_NS="asic$DEV" #name of the network namespace
else else
NET_NS="" NET_NS=""
fi fi
case "$1" in case "$1" in