Skip to content

Commit 5591321

Browse files
authored
Address upstream comments (#11)
* Remove all non bfn specific changes from upstream PR
1 parent 480bc6b commit 5591321

File tree

134 files changed

+6649
-544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+6649
-544
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@
7777
[submodule "platform/broadcom/sonic-platform-modules-mitac"]
7878
path = platform/broadcom/sonic-platform-modules-mitac
7979
url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git
80-
[submodule "platform/centec/sonic-platform-modules-e582"]
81-
path = platform/centec/sonic-platform-modules-e582
82-
url = https://github.com/CentecNetworks/sonic-platform-modules-e582
8380
[submodule "platform/barefoot/sonic-platform-modules-ingrasys"]
8481
path = platform/barefoot/sonic-platform-modules-ingrasys
8582
url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys-barefoot.git

build_debian.sh

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,22 @@
33
## an ONIE installer image.
44
##
55
## USAGE:
6-
## ./build_debian USERNAME PASSWORD_ENCRYPTED
7-
## PARAMETERS:
6+
## USERNAME=username PASSWORD=password ./build_debian
7+
## ENVIRONMENT:
88
## USERNAME
99
## The name of the default admin user
10-
## PASSWORD_ENCRYPTED
11-
## The encrypted password, expected by chpasswd command
10+
## PASSWORD
11+
## The password, expected by chpasswd command
1212

1313
## Default user
14-
USERNAME=$1
1514
[ -n "$USERNAME" ] || {
16-
echo "Error: no or empty USERNAME argument"
15+
echo "Error: no or empty USERNAME"
1716
exit 1
1817
}
1918

20-
## Password for the default user, customizable by environment variable
21-
## By default it is an empty password
22-
## You may get a crypted password by: perl -e 'print crypt("YourPaSsWoRd", "salt"),"\n"'
23-
PASSWORD_ENCRYPTED=$2
24-
[ -n "$PASSWORD_ENCRYPTED" ] || {
25-
echo "Error: no or empty PASSWORD_ENCRYPTED argument"
19+
## Password for the default user
20+
[ -n "$PASSWORD" ] || {
21+
echo "Error: no or empty PASSWORD"
2622
exit 1
2723
}
2824

@@ -178,7 +174,7 @@ sudo cp files/docker/docker.service.conf $_
178174
## Note: user should be in the group with the same name, and also in sudo/docker group
179175
sudo LANG=C chroot $FILESYSTEM_ROOT useradd -G sudo,docker $USERNAME -c "$DEFAULT_USERINFO" -m -s /bin/bash
180176
## Create password for the default user
181-
echo $USERNAME:$PASSWORD_ENCRYPTED | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd -e
177+
echo "$USERNAME:$PASSWORD" | sudo LANG=C chroot $FILESYSTEM_ROOT chpasswd
182178

183179
## Pre-install hardware drivers
184180
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install \
@@ -239,6 +235,12 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/libwrap0_*.deb || \
239235
## Disable kexec supported reboot which was installed by default
240236
sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
241237

238+
## Fix ping tools permission so non root user can directly use them
239+
## Note: this is a workaround since aufs doesn't support extended attributes
240+
## Ref: https://github.com/moby/moby/issues/5650#issuecomment-303499489
241+
## TODO: remove workaround when the overlay filesystem support extended attributes
242+
sudo chmod u+s $FILESYSTEM_ROOT/bin/ping{,6}
243+
242244
## Remove sshd host keys, and will regenerate on first sshd start
243245
sudo rm -f $FILESYSTEM_ROOT/etc/ssh/ssh_host_*_key*
244246
sudo cp files/sshd/host-ssh-keygen.sh $FILESYSTEM_ROOT/usr/local/bin/
@@ -301,6 +303,7 @@ set /files/etc/sysctl.conf/net.ipv6.conf.eth0.forwarding 0
301303
302304
set /files/etc/sysctl.conf/net.ipv6.conf.default.accept_dad 0
303305
set /files/etc/sysctl.conf/net.ipv6.conf.all.accept_dad 0
306+
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_dad 0
304307
305308
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra_defrtr 0
306309

device/accton/x86_64-accton_as7212_54x-r0/AS7212-54x/port_config.ini

100644100755
File mode changed.

device/accton/x86_64-accton_as7212_54x-r0/AS7212-54x/qos.json

100644100755
File mode changed.

device/accton/x86_64-accton_as7212_54x-r0/AS7212-54x/sai.profile

100644100755
File mode changed.

device/accton/x86_64-accton_as7212_54x-r0/installer.conf

100644100755
File mode changed.

device/accton/x86_64-accton_as7212_54x-r0/minigraph.xml

100644100755
File mode changed.

device/accton/x86_64-accton_as7212_54x-r0/plugins/eeprom.py

100644100755
File mode changed.

device/accton/x86_64-accton_as7212_54x-r0/plugins/sfputil.py

100644100755
File mode changed.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
SAI_INIT_CONFIG_FILE=/etc/bcm/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
1+
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
22
SAI_NUM_ECMP_MEMBERS=32

0 commit comments

Comments
 (0)