From 4ea631896ef386dfa7e0dfc8d91440152d84ca28 Mon Sep 17 00:00:00 2001
From: Pavel Shirshov <pavelsh@microsoft.com>
Date: Tue, 30 May 2017 13:04:06 -0700
Subject: [PATCH 1/2] Fix SAI submodule id

---
 src/SAI | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SAI b/src/SAI
index a6b5b3115f39..940c7b6afb1d 160000
--- a/src/SAI
+++ b/src/SAI
@@ -1 +1 @@
-Subproject commit a6b5b3115f39f599d39629ab9bfaeea17333d0bc
+Subproject commit 940c7b6afb1db4e8504b7cdb24ccd669748dbde8

From 9451b37583269405db7ee23266436771f37f3887 Mon Sep 17 00:00:00 2001
From: Pavel Shirshov <pavelsh@microsoft.com>
Date: Mon, 3 Jul 2017 14:16:04 -0700
Subject: [PATCH 2/2] allow-hotplug is enough. auto is not required

---
 files/image_config/interfaces/interfaces.j2 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/files/image_config/interfaces/interfaces.j2 b/files/image_config/interfaces/interfaces.j2
index 7e07c4365171..425badf7f21f 100644
--- a/files/image_config/interfaces/interfaces.j2
+++ b/files/image_config/interfaces/interfaces.j2
@@ -46,7 +46,6 @@ iface eth0 inet dhcp
 {% block front_panel_interfaces %}
 # The switch front panel interfaces
 {% for interface in minigraph_interfaces %}
-auto {{ interface['attachto'] }}
 allow-hotplug {{ interface['attachto'] }}
 iface {{ interface['attachto'] }} {{ 'inet' if interface['addr'] | ipv4 else 'inet6' }} static
     mtu 9216
@@ -59,7 +58,6 @@ iface {{ interface['attachto'] }} {{ 'inet' if interface['addr'] | ipv4 else 'in
 {% endif %}
 {% for vlan in minigraph_vlans.keys()|sort %}
 {% for member in minigraph_vlans[vlan]['members'] %}
-auto {{ member }}
 allow-hotplug {{ member }}
 iface {{ member }} inet manual
     pre-up ifconfig {{ member }} up mtu 9216
@@ -74,7 +72,6 @@ iface {{ member }} inet manual
 {% endif %}
 {% for pc in minigraph_portchannels.keys()|sort %}
 {% for member in minigraph_portchannels[pc]['members'] %}
-auto {{ member }}
 allow-hotplug {{ member }}
 iface {{ member }} inet manual
     pre-up teamdctl {{ pc }} port add {{ member }} || true
@@ -101,7 +98,6 @@ iface {{ vlan_interface['attachto'] }} {{ 'inet' if vlan_interface['addr'] | ipv
 {% block pc_interfaces %}
 # Portchannel interfaces
 {% for pc_interface in minigraph_portchannel_interfaces %}
-auto {{ pc_interface['attachto'] }}
 allow-hotplug {{ pc_interface['attachto'] }}
 iface {{ pc_interface['attachto'] }} {{ 'inet' if pc_interface['addr'] | ipv4 else 'inet6' }} static
     mtu 9216