Skip to content

Commit

Permalink
Merge pull request sonic-net#157 from SONIC-DEV/201811
Browse files Browse the repository at this point in the history
201811
  • Loading branch information
bbinxie authored Apr 30, 2020
2 parents d8415a1 + e63070a commit 2a2bde5
Show file tree
Hide file tree
Showing 259 changed files with 33,298 additions and 1,865 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ target/
*.buildinfo

# Subdirectories in src
src/dhcpmon/debian/*
!src/dhcpmon/debian/changelog
!src/dhcpmon/debian/compat
!src/dhcpmon/debian/control
!src/dhcpmon/debian/rules
src/hiredis/*
!src/hiredis/Makefile
src/igb/*
Expand All @@ -27,6 +32,9 @@ src/libteam/*
src/lldpd/*
!src/lldpd/Makefile
!src/lldpd/patch/
src/monit/*
!src/monit/Makefile
!src/monit/patch/
src/mpdecimal/*
!src/mpdecimal/Makefile
src/python-click/*
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,6 @@
[submodule "src/redis-dump-load"]
path = src/redis-dump-load
url = https://github.com/p/redis-dump-load.git
[submodule "src/telemetry/sonic-telemetry"]
path = src/telemetry/sonic-telemetry
url = https://github.com/Azure/sonic-telemetry.git
19 changes: 8 additions & 11 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount proc /proc -t proc

## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
sudo cp files/apt/sources.list $FILESYSTEM_ROOT/etc/apt/
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages}} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
sudo LANG=C chroot $FILESYSTEM_ROOT bash -c 'apt-mark auto `apt-mark showmanual`'

## Note: set lang to prevent locale warnings in your chroot
Expand All @@ -120,7 +120,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/initramfs-tools_*.deb || \
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-${LINUX_KERNEL_VERSION}-amd64_*.deb || \
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl dmidecode hdparm

## Update initramfs for booting with squashfs+overlay
cat files/initramfs-tools/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
Expand Down Expand Up @@ -215,7 +215,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
openssh-server \
python \
python-setuptools \
monit \
python-apt \
traceroute \
iputils-ping \
Expand Down Expand Up @@ -274,10 +273,6 @@ sudo mv $FILESYSTEM_ROOT/grub-pc-bin*.deb $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-
## Disable kexec supported reboot which was installed by default
sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec

## Modifty ntp default configuration: disable initial jump (add -x), and disable
## jump when time difference is greater than 1000 seconds (remove -g).
sudo sed -i "s/NTPD_OPTS='-g'/NTPD_OPTS='-x'/" $FILESYSTEM_ROOT/etc/default/ntp

## Fix ping tools permission so non root user can directly use them
## Note: this is a workaround since aufs doesn't support extended attributes
## Ref: https://github.com/moby/moby/issues/5650#issuecomment-303499489
Expand Down Expand Up @@ -313,10 +308,6 @@ EOF
sudo sed -i 's/^ListenAddress ::/#ListenAddress ::/' $FILESYSTEM_ROOT/etc/ssh/sshd_config
sudo sed -i 's/^#ListenAddress 0.0.0.0/ListenAddress 0.0.0.0/' $FILESYSTEM_ROOT/etc/ssh/sshd_config

## Config monit
sudo cp files/image_config/monit/monitrc $FILESYSTEM_ROOT/etc/monit/
sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc

## Config sysctl
sudo mkdir -p $FILESYSTEM_ROOT/var/core
sudo augtool --autosave "
Expand Down Expand Up @@ -344,6 +335,12 @@ set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_ignore 2
set /files/etc/sysctl.conf/net.ipv4.neigh.default.base_reachable_time_ms 1800000
set /files/etc/sysctl.conf/net.ipv6.neigh.default.base_reachable_time_ms 1800000
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh1 1024
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh1 1024
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh2 2048
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh2 2048
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh3 4096
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh3 4096
set /files/etc/sysctl.conf/net.ipv6.conf.default.forwarding 1
set /files/etc/sysctl.conf/net.ipv6.conf.all.forwarding 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,113 +1,113 @@
# name lanes alias index speed
Ethernet0 65 Eth1/1 0 25000
Ethernet1 66 Eth1/2 0 25000
Ethernet2 67 Eth1/3 0 25000
Ethernet3 68 Eth1/4 0 25000
Ethernet4 69 Eth2/1 1 25000
Ethernet5 70 Eth2/2 1 25000
Ethernet6 71 Eth2/3 1 25000
Ethernet7 72 Eth2/4 1 25000
Ethernet8 73 Eth3/1 2 25000
Ethernet9 74 Eth3/2 2 25000
Ethernet10 75 Eth3/3 2 25000
Ethernet11 76 Eth3/4 2 25000
Ethernet12 77 Eth4/1 3 25000
Ethernet13 78 Eth4/2 3 25000
Ethernet14 79 Eth4/3 3 25000
Ethernet15 80 Eth4/4 3 25000
Ethernet16 33 Eth5/1 4 25000
Ethernet17 34 Eth5/2 4 25000
Ethernet18 35 Eth5/3 4 25000
Ethernet19 36 Eth5/4 4 25000
Ethernet20 37 Eth6/1 5 25000
Ethernet21 38 Eth6/2 5 25000
Ethernet22 39 Eth6/3 5 25000
Ethernet23 40 Eth6/4 5 25000
Ethernet24 41 Eth7/1 6 25000
Ethernet25 42 Eth7/2 6 25000
Ethernet26 43 Eth7/3 6 25000
Ethernet27 44 Eth7/4 6 25000
Ethernet28 45 Eth8/1 7 25000
Ethernet29 46 Eth8/2 7 25000
Ethernet30 47 Eth8/3 7 25000
Ethernet31 48 Eth8/4 7 25000
Ethernet32 49 Eth9/1 8 25000
Ethernet33 50 Eth9/2 8 25000
Ethernet34 51 Eth9/3 8 25000
Ethernet35 52 Eth9/4 8 25000
Ethernet36 53 Eth10/1 9 25000
Ethernet37 54 Eth10/2 9 25000
Ethernet38 55 Eth10/3 9 25000
Ethernet39 56 Eth10/4 9 25000
Ethernet40 57 Eth11/1 10 25000
Ethernet41 58 Eth11/2 10 25000
Ethernet42 59 Eth11/3 10 25000
Ethernet43 60 Eth11/4 10 25000
Ethernet44 61 Eth12/1 11 25000
Ethernet45 62 Eth12/2 11 25000
Ethernet46 63 Eth12/3 11 25000
Ethernet47 64 Eth12/4 11 25000
Ethernet48 81 Eth13/1 12 25000
Ethernet49 82 Eth13/2 12 25000
Ethernet50 83 Eth13/3 12 25000
Ethernet51 84 Eth13/4 12 25000
Ethernet52 85 Eth14/1 13 25000
Ethernet53 86 Eth14/2 13 25000
Ethernet54 87 Eth14/3 13 25000
Ethernet55 88 Eth14/4 13 25000
Ethernet56 89 Eth15/1 14 25000
Ethernet57 90 Eth15/2 14 25000
Ethernet58 91 Eth15/3 14 25000
Ethernet59 92 Eth15/4 14 25000
Ethernet60 93 Eth16/1 15 25000
Ethernet61 94 Eth16/2 15 25000
Ethernet62 95 Eth16/3 15 25000
Ethernet63 96 Eth16/4 15 25000
Ethernet64 97 Eth17/1 16 25000
Ethernet65 98 Eth17/2 16 25000
Ethernet66 99 Eth17/3 16 25000
Ethernet67 100 Eth17/4 16 25000
Ethernet68 101 Eth18/1 17 25000
Ethernet69 102 Eth18/2 17 25000
Ethernet70 103 Eth18/3 17 25000
Ethernet71 104 Eth18/4 17 25000
Ethernet72 105 Eth19/1 18 25000
Ethernet73 106 Eth19/2 18 25000
Ethernet74 107 Eth19/3 18 25000
Ethernet75 108 Eth19/4 18 25000
Ethernet76 109 Eth20/1 19 25000
Ethernet77 110 Eth20/2 19 25000
Ethernet78 111 Eth20/3 19 25000
Ethernet79 112 Eth20/4 19 25000
Ethernet80 1 Eth21/1 20 25000
Ethernet81 2 Eth21/2 20 25000
Ethernet82 3 Eth21/3 20 25000
Ethernet83 4 Eth21/4 20 25000
Ethernet84 5 Eth22/1 21 25000
Ethernet85 6 Eth22/2 21 25000
Ethernet86 7 Eth22/3 21 25000
Ethernet87 8 Eth22/4 21 25000
Ethernet88 9 Eth23/1 22 25000
Ethernet89 10 Eth23/2 22 25000
Ethernet90 11 Eth23/3 22 25000
Ethernet91 12 Eth23/4 22 25000
Ethernet92 13 Eth24/1 23 25000
Ethernet93 14 Eth24/2 23 25000
Ethernet94 15 Eth24/3 23 25000
Ethernet95 16 Eth24/4 23 25000
Ethernet96 17,18 Eth25/1 24 50000
Ethernet98 19,20 Eth25/2 24 50000
Ethernet100 21,22 Eth26/1 25 50000
Ethernet102 23,24 Eth26/2 25 50000
Ethernet104 25,26 Eth27/1 26 50000
Ethernet106 27,28 Eth27/2 26 50000
Ethernet108 29,30 Eth28/1 27 50000
Ethernet110 31,32 Eth28/2 27 50000
Ethernet112 113,114 Eth29/1 28 50000
Ethernet114 115,116 Eth29/2 28 50000
Ethernet116 117,118 Eth30/1 29 50000
Ethernet118 119,120 Eth30/2 29 50000
Ethernet120 121,122 Eth31/1 30 50000
Ethernet122 123,124 Eth31/2 30 50000
Ethernet124 125,126 Eth32/1 31 50000
Ethernet126 127,128 Eth32/2 31 50000
Ethernet0 65 Eth1/1 1 25000
Ethernet1 66 Eth1/2 1 25000
Ethernet2 67 Eth1/3 1 25000
Ethernet3 68 Eth1/4 1 25000
Ethernet4 69 Eth2/1 2 25000
Ethernet5 70 Eth2/2 2 25000
Ethernet6 71 Eth2/3 2 25000
Ethernet7 72 Eth2/4 2 25000
Ethernet8 73 Eth3/1 3 25000
Ethernet9 74 Eth3/2 3 25000
Ethernet10 75 Eth3/3 3 25000
Ethernet11 76 Eth3/4 3 25000
Ethernet12 77 Eth4/1 4 25000
Ethernet13 78 Eth4/2 4 25000
Ethernet14 79 Eth4/3 4 25000
Ethernet15 80 Eth4/4 4 25000
Ethernet16 33 Eth5/1 5 25000
Ethernet17 34 Eth5/2 5 25000
Ethernet18 35 Eth5/3 5 25000
Ethernet19 36 Eth5/4 5 25000
Ethernet20 37 Eth6/1 6 25000
Ethernet21 38 Eth6/2 6 25000
Ethernet22 39 Eth6/3 6 25000
Ethernet23 40 Eth6/4 6 25000
Ethernet24 41 Eth7/1 7 25000
Ethernet25 42 Eth7/2 7 25000
Ethernet26 43 Eth7/3 7 25000
Ethernet27 44 Eth7/4 7 25000
Ethernet28 45 Eth8/1 8 25000
Ethernet29 46 Eth8/2 8 25000
Ethernet30 47 Eth8/3 8 25000
Ethernet31 48 Eth8/4 8 25000
Ethernet32 49 Eth9/1 9 25000
Ethernet33 50 Eth9/2 9 25000
Ethernet34 51 Eth9/3 9 25000
Ethernet35 52 Eth9/4 9 25000
Ethernet36 53 Eth10/1 10 25000
Ethernet37 54 Eth10/2 10 25000
Ethernet38 55 Eth10/3 10 25000
Ethernet39 56 Eth10/4 10 25000
Ethernet40 57 Eth11/1 11 25000
Ethernet41 58 Eth11/2 11 25000
Ethernet42 59 Eth11/3 11 25000
Ethernet43 60 Eth11/4 11 25000
Ethernet44 61 Eth12/1 12 25000
Ethernet45 62 Eth12/2 12 25000
Ethernet46 63 Eth12/3 12 25000
Ethernet47 64 Eth12/4 12 25000
Ethernet48 81 Eth13/1 13 25000
Ethernet49 82 Eth13/2 13 25000
Ethernet50 83 Eth13/3 13 25000
Ethernet51 84 Eth13/4 13 25000
Ethernet52 85 Eth14/1 14 25000
Ethernet53 86 Eth14/2 14 25000
Ethernet54 87 Eth14/3 14 25000
Ethernet55 88 Eth14/4 14 25000
Ethernet56 89 Eth15/1 15 25000
Ethernet57 90 Eth15/2 15 25000
Ethernet58 91 Eth15/3 15 25000
Ethernet59 92 Eth15/4 15 25000
Ethernet60 93 Eth16/1 16 25000
Ethernet61 94 Eth16/2 16 25000
Ethernet62 95 Eth16/3 16 25000
Ethernet63 96 Eth16/4 16 25000
Ethernet64 97 Eth17/1 17 25000
Ethernet65 98 Eth17/2 17 25000
Ethernet66 99 Eth17/3 17 25000
Ethernet67 100 Eth17/4 17 25000
Ethernet68 101 Eth18/1 18 25000
Ethernet69 102 Eth18/2 18 25000
Ethernet70 103 Eth18/3 18 25000
Ethernet71 104 Eth18/4 18 25000
Ethernet72 105 Eth19/1 19 25000
Ethernet73 106 Eth19/2 19 25000
Ethernet74 107 Eth19/3 19 25000
Ethernet75 108 Eth19/4 19 25000
Ethernet76 109 Eth20/1 20 25000
Ethernet77 110 Eth20/2 20 25000
Ethernet78 111 Eth20/3 20 25000
Ethernet79 112 Eth20/4 20 25000
Ethernet80 1 Eth21/1 21 25000
Ethernet81 2 Eth21/2 21 25000
Ethernet82 3 Eth21/3 21 25000
Ethernet83 4 Eth21/4 21 25000
Ethernet84 5 Eth22/1 22 25000
Ethernet85 6 Eth22/2 22 25000
Ethernet86 7 Eth22/3 22 25000
Ethernet87 8 Eth22/4 22 25000
Ethernet88 9 Eth23/1 23 25000
Ethernet89 10 Eth23/2 23 25000
Ethernet90 11 Eth23/3 23 25000
Ethernet91 12 Eth23/4 23 25000
Ethernet92 13 Eth24/1 24 25000
Ethernet93 14 Eth24/2 24 25000
Ethernet94 15 Eth24/3 24 25000
Ethernet95 16 Eth24/4 24 25000
Ethernet96 17,18 Eth25/1 25 50000
Ethernet98 19,20 Eth25/2 25 50000
Ethernet100 21,22 Eth26/1 26 50000
Ethernet102 23,24 Eth26/2 26 50000
Ethernet104 25,26 Eth27/1 27 50000
Ethernet106 27,28 Eth27/2 27 50000
Ethernet108 29,30 Eth28/1 28 50000
Ethernet110 31,32 Eth28/2 28 50000
Ethernet112 113,114 Eth29/1 29 50000
Ethernet114 115,116 Eth29/2 29 50000
Ethernet116 117,118 Eth30/1 30 50000
Ethernet118 119,120 Eth30/2 30 50000
Ethernet120 121,122 Eth31/1 31 50000
Ethernet122 123,124 Eth31/2 31 50000
Ethernet124 125,126 Eth32/1 32 50000
Ethernet126 127,128 Eth32/2 32 50000
Loading

0 comments on commit 2a2bde5

Please sign in to comment.