From 0a53ef04b6e6e4ca934f11f26e15be375c7477a7 Mon Sep 17 00:00:00 2001
From: Judy Joseph <judy.joseph@microsoft.com>
Date: Tue, 2 Feb 2021 09:12:41 -0800
Subject: [PATCH] Port fix for
 https://github.com/Azure/sonic-buildimage/pull/6537 in 201911

---
 files/build_templates/docker_image_ctl.j2 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index ec7a15a0332..3ab779a3b0c 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -366,7 +366,12 @@ wait() {
 }
 
 stop() {
+{%- if docker_container_name == "teamd" %}
+    # Longer timeout of 60 sec to wait for Portchannels to be cleaned.
+    docker stop -t 60 {{docker_container_name}}$DEV
+{%- else %}
     docker stop {{docker_container_name}}$DEV
+{%- endif %}
 {%- if docker_container_name == "database" %}
     if [ "$DEV" ]; then 
         ip netns delete "$NET_NS"