Skip to content

Commit

Permalink
Revert "update from azure/201911 (sonic-net#180)"
Browse files Browse the repository at this point in the history
This reverts commit 906745c.
  • Loading branch information
bbinxie authored May 22, 2020
1 parent 906745c commit 2eeaf61
Show file tree
Hide file tree
Showing 44 changed files with 118 additions and 1,174 deletions.
2 changes: 1 addition & 1 deletion build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
"deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian stretch stable"
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2

if [ "$INSTALL_KUBERNETES" == "y" ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ port_phy_addr=0xff
robust_hash_disable_egress_vlan=1
robust_hash_disable_mpls=1
robust_hash_disable_vlan=1
sram_scan_enable=0
stable_size=0x5500000
tdma_timeout_usec=15000000
tslam_timeout_usec=15000000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,7 @@ port_phy_addr_147.0=0xff
robust_hash_disable_egress_vlan.0=1
robust_hash_disable_mpls.0=1
robust_hash_disable_vlan.0=1
sram_scan_enable.0=0
tdma_timeout_usec.0=15000000
tslam_timeout_usec.0=15000000

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,7 @@ port_phy_addr_143.0=0xff
robust_hash_disable_egress_vlan.0=1
robust_hash_disable_mpls.0=1
robust_hash_disable_vlan.0=1
sram_scan_enable.0=0
tdma_timeout_usec.0=15000000
tslam_timeout_usec.0=15000000

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"skip_fancontrol": true,
"skip_ledd": true,
"skip_xcvrd": false,
"skip_psud": false,
"skip_syseepromd": false
"skip_syseepromd": false
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"skip_fancontrol": true,
"skip_ledd": true,
"skip_xcvrd": false,
"skip_psud": false,
"skip_syseepromd": false
"skip_syseepromd": false
}
8 changes: 4 additions & 4 deletions device/dell/x86_64-dell_s6000_s1220-r0/sensors.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# tmp75-i2c-11-4e is an ambient temperature sensor.

chip "tmp75-*"
set temp1_max 80
set temp1_max_hyst 70
set temp1_max 50
set temp1_max_hyst 25

# emc1403-i2c-10-4d has following temperature sensors:
# temp1: CPU0 external Temp Sensor
Expand All @@ -32,5 +32,5 @@ chip "jc42-*"
set temp1_crit 85

chip "dni_dps460-*"
set temp1_max 80
set temp2_max 80
set temp1_max 50
set temp2_max 50

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2eeaf61

Please sign in to comment.