From 3f2f8c86a97da79003890a2baab0e2991bcf5569 Mon Sep 17 00:00:00 2001 From: lguohan Date: Wed, 7 Jun 2017 10:35:52 -0700 Subject: [PATCH 1/4] Revert "[platform]: Update submodule platform/broadcom/sonic-platform-modules-ingrasys (#670)" This reverts commit 50aba596a919fae7b0deb058d3ee093c9bfcade6. From fed99224e7c3e4fae77275cb36d7a732c9eab684 Mon Sep 17 00:00:00 2001 From: lguohan Date: Wed, 7 Jun 2017 10:35:52 -0700 Subject: [PATCH 2/4] Revert "[platform]: update platform modules for dell s6100 and z9100 (#679)" This reverts commit 67acc0171b6022631ca53bfc2ece2fb8b0ec6b02. From e3bad3d14607c2d793962853d3814e3bb908fd01 Mon Sep 17 00:00:00 2001 From: lguohan Date: Wed, 7 Jun 2017 10:35:52 -0700 Subject: [PATCH 3/4] Revert "Disable snmpd native ipCidrRouteTable implementation (#675)" This reverts commit ec273c88920e66dc2daa1bfb2703774b3861255a. From eb998860fbe093744680116bb79f80a1f9e92b05 Mon Sep 17 00:00:00 2001 From: lguohan Date: Wed, 7 Jun 2017 10:35:52 -0700 Subject: [PATCH 4/4] Revert "[baseos] Avoid disconnecting mgmt when re-cfg interfaces (#553)" This reverts commit e74196cd75ed1c8bb2556c2ee0199d03bad98dc2. --- files/image_config/interfaces/interfaces-config.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/files/image_config/interfaces/interfaces-config.sh b/files/image_config/interfaces/interfaces-config.sh index f966e82e8030..3e2f852c1263 100755 --- a/files/image_config/interfaces/interfaces-config.sh +++ b/files/image_config/interfaces/interfaces-config.sh @@ -1,12 +1,5 @@ #!/bin/bash -ifdown -a -X eth0 sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/interfaces.j2 >/etc/network/interfaces -ifup -a -X eth0 - -NEW_MGMT_IP=`sonic-cfggen -m /etc/sonic/minigraph.xml -v 'minigraph_mgmt_interface["addr"]'` -NEW_MGMT_MASK=`sonic-cfggen -m /etc/sonic/minigraph.xml -v 'minigraph_mgmt_interface["mask"]'` - -ifconfig eth0 $NEW_MGMT_IP netmask $NEW_MGMT_MASK -[ -f /var/run/dhclient.eth0.pid ] && kill `cat /var/run/dhclient.eth0.pid` && rm -f /var/run/dhclient.eth0.pid - +service networking restart +ifdown lo && ifup lo