matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[arista]: Bump sonic-platform-modules-arista submodule (#1111)

Browse Source 
* Bump sonic-platform-modules-arista

Improves i2c performance for xcvrs
Fix the led_plugin by ignoring unknown ports
Miscellaneous improvements

* Fix index column for Arista-7260CX3-D108C8

* Fix flash permissions for Arista platforms

The ext4 flash uses acl to properly handle permissions in EOS.
Aboot isn't built with this support and therefore can't be used
to set the flash permissions. It has to be deferred in sonic initrd.
This commit is contained in:
Samuel Angebault 2017-11-03 15:22:05 -07:00 committed by lguohan
parent a7e602501c
commit ca214b947c
4 changed files with 137 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/port_config.ini
View File

@ -1,121 +1,121 @@
# name lanes alias index # name lanes alias index
Ethernet0 77,78 Ethernet1/1 1 Ethernet0 77,78 Ethernet1/1 1
Ethernet2 79,80 Ethernet1/3 2 Ethernet2 79,80 Ethernet1/3 1
Ethernet4 65,66 Ethernet2/1 3 Ethernet4 65,66 Ethernet2/1 2
Ethernet6 67,68 Ethernet2/3 4 Ethernet6 67,68 Ethernet2/3 2
Ethernet8 85,86 Ethernet3/1 5 Ethernet8 85,86 Ethernet3/1 3
Ethernet10 87,88 Ethernet3/3 6 Ethernet10 87,88 Ethernet3/3 3
Ethernet12 89,90 Ethernet4/1 7 Ethernet12 89,90 Ethernet4/1 4
Ethernet14 91,92 Ethernet4/3 8 Ethernet14 91,92 Ethernet4/3 4
Ethernet16 109,110 Ethernet5/1 9 Ethernet16 109,110 Ethernet5/1 5
Ethernet18 111,112 Ethernet5/3 10 Ethernet18 111,112 Ethernet5/3 5
Ethernet20 97,98 Ethernet6/1 11 Ethernet20 97,98 Ethernet6/1 6
Ethernet22 99,100 Ethernet6/3 12 Ethernet22 99,100 Ethernet6/3 6
Ethernet24 5,6 Ethernet7/1 13 Ethernet24 5,6 Ethernet7/1 7
Ethernet26 7,8 Ethernet7/3 14 Ethernet26 7,8 Ethernet7/3 7
Ethernet28 13,14 Ethernet8/1 15 Ethernet28 13,14 Ethernet8/1 8
Ethernet30 15,16 Ethernet8/3 16 Ethernet30 15,16 Ethernet8/3 8
Ethernet32 25,26 Ethernet9/1 17 Ethernet32 25,26 Ethernet9/1 9
Ethernet34 27,28 Ethernet9/3 18 Ethernet34 27,28 Ethernet9/3 9
Ethernet36 21,22 Ethernet10/1 19 Ethernet36 21,22 Ethernet10/1 10
Ethernet38 23,24 Ethernet10/3 20 Ethernet38 23,24 Ethernet10/3 10
Ethernet40 37,38 Ethernet11/1 21 Ethernet40 37,38 Ethernet11/1 11
Ethernet42 39,40 Ethernet11/3 22 Ethernet42 39,40 Ethernet11/3 11
Ethernet44 45,46 Ethernet12/1 23 Ethernet44 45,46 Ethernet12/1 12
Ethernet46 47,48 Ethernet12/3 24 Ethernet46 47,48 Ethernet12/3 12
Ethernet48 57,58 Ethernet13/1 25 Ethernet48 57,58 Ethernet13/1 13
Ethernet50 59,60 Ethernet13/3 26 Ethernet50 59,60 Ethernet13/3 13
Ethernet52 53,54 Ethernet14/1 27 Ethernet52 53,54 Ethernet14/1 14
Ethernet54 55,56 Ethernet14/3 28 Ethernet54 55,56 Ethernet14/3 14
Ethernet56 117,118 Ethernet15/1 29 Ethernet56 117,118 Ethernet15/1 15
Ethernet58 119,120 Ethernet15/3 30 Ethernet58 119,120 Ethernet15/3 15
Ethernet60 121,122 Ethernet16/1 31 Ethernet60 121,122 Ethernet16/1 16
Ethernet62 123,124 Ethernet16/3 32 Ethernet62 123,124 Ethernet16/3 16
Ethernet64 141,142 Ethernet17/1 33 Ethernet64 141,142 Ethernet17/1 17
Ethernet66 143,144 Ethernet17/3 34 Ethernet66 143,144 Ethernet17/3 17
Ethernet68 133,134,135,136 Ethernet18/1 35 Ethernet68 133,134,135,136 Ethernet18/1 18
Ethernet72 197,198 Ethernet19/1 36 Ethernet72 197,198 Ethernet19/1 19
Ethernet74 199,200 Ethernet19/3 37 Ethernet74 199,200 Ethernet19/3 19
Ethernet76 205,206,207,208 Ethernet20/1 38 Ethernet76 205,206,207,208 Ethernet20/1 20
Ethernet80 217,218 Ethernet21/1 39 Ethernet80 217,218 Ethernet21/1 21
Ethernet82 219,220 Ethernet21/3 40 Ethernet82 219,220 Ethernet21/3 21
Ethernet84 213,214 Ethernet22/1 41 Ethernet84 213,214 Ethernet22/1 22
Ethernet86 215,216 Ethernet22/3 42 Ethernet86 215,216 Ethernet22/3 22
Ethernet88 229,230 Ethernet23/1 43 Ethernet88 229,230 Ethernet23/1 23
Ethernet90 231,232 Ethernet23/3 44 Ethernet90 231,232 Ethernet23/3 23
Ethernet92 237,238 Ethernet24/1 45 Ethernet92 237,238 Ethernet24/1 24
Ethernet94 239,240 Ethernet24/3 46 Ethernet94 239,240 Ethernet24/3 24
Ethernet96 249,250 Ethernet25/1 47 Ethernet96 249,250 Ethernet25/1 25
Ethernet98 251,252 Ethernet25/3 48 Ethernet98 251,252 Ethernet25/3 25
Ethernet100 245,246 Ethernet26/1 49 Ethernet100 245,246 Ethernet26/1 26
Ethernet102 247,248 Ethernet26/3 50 Ethernet102 247,248 Ethernet26/3 26
Ethernet104 149,150 Ethernet27/1 51 Ethernet104 149,150 Ethernet27/1 27
Ethernet106 151,152 Ethernet27/3 52 Ethernet106 151,152 Ethernet27/3 27
Ethernet108 153,154 Ethernet28/1 53 Ethernet108 153,154 Ethernet28/1 28
Ethernet110 155,156 Ethernet28/3 54 Ethernet110 155,156 Ethernet28/3 28
Ethernet112 173,174 Ethernet29/1 55 Ethernet112 173,174 Ethernet29/1 29
Ethernet114 175,176 Ethernet29/3 56 Ethernet114 175,176 Ethernet29/3 29
Ethernet116 161,162 Ethernet30/1 57 Ethernet116 161,162 Ethernet30/1 30
Ethernet118 163,164 Ethernet30/3 58 Ethernet118 163,164 Ethernet30/3 30
Ethernet120 181,182 Ethernet31/1 59 Ethernet120 181,182 Ethernet31/1 31
Ethernet122 183,184 Ethernet31/3 60 Ethernet122 183,184 Ethernet31/3 31
Ethernet124 185,186 Ethernet32/1 61 Ethernet124 185,186 Ethernet32/1 32
Ethernet126 187,188 Ethernet32/3 62 Ethernet126 187,188 Ethernet32/3 32
Ethernet128 69,70 Ethernet33/1 63 Ethernet128 69,70 Ethernet33/1 33
Ethernet130 71,72 Ethernet33/3 64 Ethernet130 71,72 Ethernet33/3 33
Ethernet132 73,74 Ethernet34/1 65 Ethernet132 73,74 Ethernet34/1 34
Ethernet134 75,76 Ethernet34/3 66 Ethernet134 75,76 Ethernet34/3 34
Ethernet136 93,94 Ethernet35/1 67 Ethernet136 93,94 Ethernet35/1 35
Ethernet138 95,96 Ethernet35/3 68 Ethernet138 95,96 Ethernet35/3 35
Ethernet140 81,82 Ethernet36/1 69 Ethernet140 81,82 Ethernet36/1 36
Ethernet142 83,84 Ethernet36/3 70 Ethernet142 83,84 Ethernet36/3 36
Ethernet144 101,102 Ethernet37/1 71 Ethernet144 101,102 Ethernet37/1 37
Ethernet146 103,104 Ethernet37/3 72 Ethernet146 103,104 Ethernet37/3 37
Ethernet148 105,106 Ethernet38/1 73 Ethernet148 105,106 Ethernet38/1 38
Ethernet150 107,108 Ethernet38/3 74 Ethernet150 107,108 Ethernet38/3 38
Ethernet152 9,10 Ethernet39/1 75 Ethernet152 9,10 Ethernet39/1 39
Ethernet154 11,12 Ethernet39/3 76 Ethernet154 11,12 Ethernet39/3 39
Ethernet156 1,2 Ethernet40/1 77 Ethernet156 1,2 Ethernet40/1 40
Ethernet158 3,4 Ethernet40/3 78 Ethernet158 3,4 Ethernet40/3 40
Ethernet160 17,18 Ethernet41/1 79 Ethernet160 17,18 Ethernet41/1 41
Ethernet162 19,20 Ethernet41/3 80 Ethernet162 19,20 Ethernet41/3 41
Ethernet164 29,30 Ethernet42/1 81 Ethernet164 29,30 Ethernet42/1 42
Ethernet166 31,32 Ethernet42/1 82 Ethernet166 31,32 Ethernet42/1 42
Ethernet168 41,42 Ethernet43/1 83 Ethernet168 41,42 Ethernet43/1 43
Ethernet170 43,44 Ethernet43/3 84 Ethernet170 43,44 Ethernet43/3 43
Ethernet172 33,34 Ethernet44/1 85 Ethernet172 33,34 Ethernet44/1 44
Ethernet174 35,36 Ethernet44/3 86 Ethernet174 35,36 Ethernet44/3 44
Ethernet176 49,50,51,52 Ethernet45/1 87 Ethernet176 49,50,51,52 Ethernet45/1 45
Ethernet180 61,62,63,64 Ethernet46/1 88 Ethernet180 61,62,63,64 Ethernet46/1 46
Ethernet184 125,126,127,128 Ethernet47/1 89 Ethernet184 125,126,127,128 Ethernet47/1 47
Ethernet188 113,114,115,116 Ethernet48/1 90 Ethernet188 113,114,115,116 Ethernet48/1 48
Ethernet192 129,130,131,132 Ethernet49/1 91 Ethernet192 129,130,131,132 Ethernet49/1 49
Ethernet196 137,138,139,140 Ethernet50/1 92 Ethernet196 137,138,139,140 Ethernet50/1 50
Ethernet200 201,202,203,204 Ethernet51/1 93 Ethernet200 201,202,203,204 Ethernet51/1 51
Ethernet204 193,194,195,196 Ethernet52/1 94 Ethernet204 193,194,195,196 Ethernet52/1 52
Ethernet208 209,210 Ethernet53/1 95 Ethernet208 209,210 Ethernet53/1 53
Ethernet210 211,212 Ethernet53/3 96 Ethernet210 211,212 Ethernet53/3 53
Ethernet212 221,222 Ethernet54/1 97 Ethernet212 221,222 Ethernet54/1 54
Ethernet214 223,224 Ethernet54/3 98 Ethernet214 223,224 Ethernet54/3 54
Ethernet216 233,234 Ethernet55/1 99 Ethernet216 233,234 Ethernet55/1 55
Ethernet218 235,236 Ethernet55/3 100 Ethernet218 235,236 Ethernet55/3 55
Ethernet220 225,226 Ethernet56/1 101 Ethernet220 225,226 Ethernet56/1 56
Ethernet222 227,228 Ethernet56/3 102 Ethernet222 227,228 Ethernet56/3 56
Ethernet224 241,242 Ethernet57/1 103 Ethernet224 241,242 Ethernet57/1 57
Ethernet226 243,244 Ethernet57/3 104 Ethernet226 243,244 Ethernet57/3 57
Ethernet228 253,254 Ethernet58/1 105 Ethernet228 253,254 Ethernet58/1 58
Ethernet230 255,256 Ethernet58/3 106 Ethernet230 255,256 Ethernet58/3 58
Ethernet232 157,158 Ethernet59/1 107 Ethernet232 157,158 Ethernet59/1 59
Ethernet234 159,160 Ethernet59/3 108 Ethernet234 159,160 Ethernet59/3 59
Ethernet236 145,146 Ethernet60/1 109 Ethernet236 145,146 Ethernet60/1 60
Ethernet238 147,148 Ethernet60/3 110 Ethernet238 147,148 Ethernet60/3 60
Ethernet240 165,166 Ethernet61/1 111 Ethernet240 165,166 Ethernet61/1 61
Ethernet242 167,168 Ethernet61/3 112 Ethernet242 167,168 Ethernet61/3 61
Ethernet244 169,170 Ethernet62/1 113 Ethernet244 169,170 Ethernet62/1 62
Ethernet246 171,172 Ethernet62/3 114 Ethernet246 171,172 Ethernet62/3 62
Ethernet248 189,190 Ethernet63/1 115 Ethernet248 189,190 Ethernet63/1 63
Ethernet250 191,192 Ethernet63/3 116 Ethernet250 191,192 Ethernet63/3 63
Ethernet252 177,178 Ethernet64/1 117 Ethernet252 177,178 Ethernet64/1 64
Ethernet254 179,180 Ethernet64/3 118 Ethernet254 179,180 Ethernet64/3 64
Ethernet256 257 Ethernet257 119 Ethernet256 257 Ethernet65 65
Ethernet260 259 Ethernet259 120 Ethernet260 259 Ethernet66 66

3
files/Aboot/boot0.j2
View File

@ -65,9 +65,6 @@ extract_image() {
## vfat does not support symbol link ## vfat does not support symbol link
if [ -n "$sonic_upgrade" ] || [ "$rootfs_type" != "vfat" ]; then if [ -n "$sonic_upgrade" ] || [ "$rootfs_type" != "vfat" ]; then
## on ext4, other doesn't have access to the flash by default
chmod o+rx "$target_path"
mkdir -p "$image_path/{{ DOCKERFS_DIR }}" mkdir -p "$image_path/{{ DOCKERFS_DIR }}"
if [ -n "$sonic_upgrade" ]; then if [ -n "$sonic_upgrade" ]; then

18
files/initramfs-tools/arista-convertfs.j2
View File

@ -82,6 +82,13 @@ run_cmd() {
fi fi
} }
fixup_flash_permissions() {
# properly set flash permissions for others
# this allows the sonic admin user to have read access on the flash
local flash_mnt="$1"
chmod o+rx "$flash_mnt"
}
# Extract kernel parameters # Extract kernel parameters
set -- $(cat /proc/cmdline) set -- $(cat /proc/cmdline)
for x in "$@"; do for x in "$@"; do
@ -111,7 +118,14 @@ if ! wait_for_root_dev; then
fi fi
# exit when the root is ext4 # exit when the root is ext4
blkid | grep "$root_dev.*vfat" -q || exit 0 if ! blkid | grep "$root_dev.*vfat" -q; then
mkdir -p "$root_mnt"
mount -t ext4 "$root_dev" "$root_mnt"
fixup_flash_permissions "$root_mnt"
umount "$root_mnt"
rmdir "$root_mnt"
exit 0
fi
# Get flash dev name # Get flash dev name
if [ -z "$block_flash" ]; then if [ -z "$block_flash" ]; then
@ -176,3 +190,5 @@ run_cmd "$cmd" "$err_msg"
err_msg="Error: copying files form $tmp_mnt to $root_mnt failed" err_msg="Error: copying files form $tmp_mnt to $root_mnt failed"
cmd="cp -a $tmp_mnt/. $root_mnt/" cmd="cp -a $tmp_mnt/. $root_mnt/"
run_cmd "$cmd" "$err_msg" run_cmd "$cmd" "$err_msg"
fixup_flash_permissions "$root_mnt"

2
platform/broadcom/sonic-platform-modules-arista

@ -1 +1 @@
Subproject commit d1417bff17780255d4cc371b315f620087673eb8 Subproject commit f985b188326e480124ec49541b4fecc51a213889