Skip to content

Commit 054f7c0

Browse files
xumiaxumia
committed
Merged PR 8350983: Merge code from master to internal
Highlight change, the DHCP config removed from master branch. files/image_config/resolv-config/resolv.conf Related work items: sonic-net#49, sonic-net#2598, sonic-net#11862, sonic-net#12530, sonic-net#14000, sonic-net#14549, sonic-net#14814, sonic-net#15077, sonic-net#15252, sonic-net#15253, sonic-net#15357, sonic-net#15384, sonic-net#15394, sonic-net#15399, sonic-net#15405, sonic-net#15566, sonic-net#15591, sonic-net#15592, sonic-net#15593, sonic-net#15602, sonic-net#15604, sonic-net#15611, sonic-net#15621, sonic-net#15625, sonic-net#15634, sonic-net#15635
1 parent eda49cc commit 054f7c0

File tree

159 files changed

+1897
-255
lines changed

Some content is hidden

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

159 files changed

+1897
-255
lines changed

‎.azure-pipelines/run-test-scheduler-template.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ parameters:
3434
type: string
3535
default: "ceos"
3636

37-
- name: SPECIFIED_PARAMS
38-
type: string
39-
default: "{}"
40-
4137
- name: MGMT_BRANCH
4238
type: string
4339
default: internal
@@ -61,7 +57,7 @@ steps:
6157
--min-worker ${{ parameters.MIN_WORKER }} --max-worker ${{ parameters.MAX_WORKER }} \
6258
--test-set ${{ parameters.TEST_SET }} --kvm-build-id $(KVM_BUILD_ID) \
6359
--deploy-mg-extra-params "${{ parameters.DEPLOY_MG_EXTRA_PARAMS }}" --common-extra-params "${{ parameters.COMMON_EXTRA_PARAMS }}" \
64-
--mgmt-branch ${{ parameters.MGMT_BRANCH }} --vm-type ${{ parameters.VM_TYPE }} --specified-params "${{ parameters.SPECIFIED_PARAMS }}" \
60+
--mgmt-branch ${{ parameters.MGMT_BRANCH }} --vm-type ${{ parameters.VM_TYPE }} \
6561
--num-asic ${{ parameters.NUM_ASIC }} --azp-access-token ":$(System.AccessToken)" --azp-repo-access-token $(AZP_REPO_ACCESS_TOKEN) \
6662
--azp-pr-id $(System.PullRequest.PullRequestId)
6763
TEST_PLAN_ID=`cat new_test_plan_id.txt`

‎README.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,34 @@
77
[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=master&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=master)
88
[![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=master&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=master)
99
[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=master&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=master)
10+
[![Marvell(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-arm64?branchName=master&label=Marvell-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=master)
1011
[![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=master&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=master)
1112
[![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=master&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=master)
1213

14+
*202305 builds*:
15+
16+
[![Barefoot](https://dev.azure.com/mssonic/build/_apis/build/status/barefoot/Azure.sonic-buildimage.official.barefoot?branchName=202205&label=Barefoot)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=146&branchName=202305)
17+
[![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=202305&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=202305)
18+
[![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=202305&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=202305)
19+
[![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=202305&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=202305)
20+
[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=202305&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=202305)
21+
[![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=202305&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=202305)
22+
[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=202305&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=202305)
23+
[![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=202305&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=202305)
24+
[![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=202305&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=202305)
25+
26+
*202211 builds*:
27+
28+
[![Barefoot](https://dev.azure.com/mssonic/build/_apis/build/status/barefoot/Azure.sonic-buildimage.official.barefoot?branchName=202205&label=Barefoot)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=146&branchName=202211)
29+
[![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=202211&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=202211)
30+
[![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=202211&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=202211)
31+
[![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=202211&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=202211)
32+
[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=202211&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=202211)
33+
[![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=202211&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=202211)
34+
[![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=202211&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=202211)
35+
[![Nephos](https://dev.azure.com/mssonic/build/_apis/build/status/nephos/Azure.sonic-buildimage.official.nephos?branchName=202211&label=Nephos)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=149&branchName=202211)
36+
[![VS](https://dev.azure.com/mssonic/build/_apis/build/status/vs/Azure.sonic-buildimage.official.vs?branchName=202211&label=VS)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=142&branchName=202211)
37+
1338
*202205 builds*:
1439

1540
[![Barefoot](https://dev.azure.com/mssonic/build/_apis/build/status/barefoot/Azure.sonic-buildimage.official.barefoot?branchName=202205&label=Barefoot)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=146&branchName=202205)

‎azure-pipelines.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -108,27 +108,26 @@ stages:
108108
sudo rm -rf ../*.deb
109109
displayName: "Cleanup"
110110
111-
- task: DownloadPipelineArtifact@2
112-
inputs:
113-
source: specific
114-
project: build
115-
pipeline: 9
116-
artifact: sonic-swss-common.amd64.ubuntu20_04
117-
runVersion: 'latestFromBranch'
118-
runBranch: 'refs/heads/master'
119-
displayName: "Download sonic swss common deb packages"
120-
121111
- task: DownloadPipelineArtifact@2
122112
inputs:
123113
artifact: sonic-buildimage.vs
124114
displayName: "Download sonic-buildimage.vs artifact"
125115

126116
- script: |
127-
set -x
128117
sudo apt-get update
129-
sudo apt-get install libyang0.16 -y
130-
sudo dpkg -i --force-confask,confnew ../libswsscommon_1.0.0_amd64.deb
131-
sudo dpkg -i ../python3-swsscommon_1.0.0_amd64.deb
118+
sudo apt-get install -y make libtool m4 autoconf dh-exec debhelper cmake pkg-config \
119+
libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev swig3.0 \
120+
libpython2.7-dev libboost-dev libboost-serialization-dev uuid-dev libzmq5 libzmq3-dev python3-pip \
121+
cmake libgtest-dev libgmock-dev libyang-dev
122+
sudo pip3 install pytest
123+
cd src/sonic-swss-common
124+
./autogen.sh
125+
dpkg-buildpackage -rfakeroot -us -uc -b -j$(nproc)
126+
sudo dpkg -i --force-confask,confnew ../libswsscommon_*.deb
127+
sudo dpkg -i ../python3-swsscommon_*.deb
128+
displayName: "Compile sonic swss common"
129+
130+
- script: |
132131
sudo docker load -i ../target/docker-sonic-vs.gz
133132
docker tag docker-sonic-vs:latest docker-sonic-vs:$(Build.BuildNumber)
134133
username=$(id -un)
@@ -224,9 +223,8 @@ stages:
224223
MIN_WORKER: $(T0_SONIC_INSTANCE_NUM)
225224
MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
226225
TEST_SET: t0-sonic
227-
COMMON_EXTRA_PARAMS: "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"
226+
COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
228227
VM_TYPE: vsonic
229-
SPECIFIED_PARAMS: '{\"test_pretest.py\":[\"--completeness_level=confident\",\"--allow_recover\"],\"test_posttest.py\":[\"--completeness_level=confident\",\"--allow_recover\"]}'
230228

231229
- job: wan_elastictest
232230
displayName: "kvmtest-wan by Elastictest"

‎build_debian.sh

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
111111
[ -d $TRUSTED_GPG_DIR ] && [ ! -z "$(ls $TRUSTED_GPG_DIR)" ] && sudo cp $TRUSTED_GPG_DIR/* ${FILESYSTEM_ROOT}/etc/apt/trusted.gpg.d/
112112

113113
## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
114-
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
114+
scripts/build_mirror_config.sh files/apt $CONFIGURED_ARCH $IMAGE_DISTRO
115115
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
116116
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until,apt-multiple-retries} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
117117

@@ -294,7 +294,7 @@ then
294294
## Install Kubernetes master
295295
echo '[INFO] Install kubernetes master'
296296
install_kubernetes ${MASTER_KUBERNETES_VERSION}
297-
297+
298298
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -fsSL \
299299
https://packages.microsoft.com/keys/microsoft.asc | \
300300
sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add -
@@ -309,7 +309,7 @@ then
309309
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove gnupg
310310
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/cri-dockerd.deb -fsSL \
311311
https://github.com/Mirantis/cri-dockerd/releases/download/v${MASTER_CRI_DOCKERD}/cri-dockerd_${MASTER_CRI_DOCKERD}.3-0.debian-${IMAGE_DISTRO}_amd64.deb
312-
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-dockerd.deb
312+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install -f /tmp/cri-dockerd.deb
313313
sudo LANG=C chroot $FILESYSTEM_ROOT rm -f /tmp/cri-dockerd.deb
314314
else
315315
echo '[INFO] Skipping Install kubernetes master'
@@ -400,6 +400,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
400400
jq \
401401
auditd \
402402
linux-perf \
403+
resolvconf \
403404
lsof \
404405
sysstat
405406

@@ -447,6 +448,14 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
447448
systemd-sysv \
448449
ntp
449450

451+
# Workaround for issue: The udev rule may fail to be executed because the
452+
# daemon-reload command is executed in parallel
453+
# Github issue: https://github.com/systemd/systemd/issues/24668
454+
# Github PR: https://github.com/systemd/systemd/pull/24673
455+
# This workaround should be removed after a upstream already contains the fixes
456+
sudo patch $FILESYSTEM_ROOT/lib/systemd/system/systemd-udevd.service \
457+
files/image_config/systemd/systemd-udevd/fix-udev-rule-may-fail-if-daemon-reload-command-runs.patch
458+
450459
if [[ $TARGET_BOOTLOADER == grub ]]; then
451460
if [[ $CONFIGURED_ARCH == amd64 ]]; then
452461
GRUB_PKG=grub-pc-bin
@@ -651,10 +660,10 @@ then
651660
fi
652661

653662
# #################
654-
# secure boot
663+
# secure boot
655664
# #################
656665
if [[ $SECURE_UPGRADE_MODE == 'dev' || $SECURE_UPGRADE_MODE == "prod" && $SONIC_ENABLE_SECUREBOOT_SIGNATURE != 'y' ]]; then
657-
# note: SONIC_ENABLE_SECUREBOOT_SIGNATURE is a feature that signing just kernel,
666+
# note: SONIC_ENABLE_SECUREBOOT_SIGNATURE is a feature that signing just kernel,
658667
# SECURE_UPGRADE_MODE is signing all the boot component including kernel.
659668
# its required to do not enable both features together to avoid conflicts.
660669
echo "Secure Boot support build stage: Starting .."
@@ -663,14 +672,14 @@ if [[ $SECURE_UPGRADE_MODE == 'dev' || $SECURE_UPGRADE_MODE == "prod" && $SONIC_
663672
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
664673
shim-unsigned \
665674
grub-efi
666-
675+
667676
if [ ! -f $SECURE_UPGRADE_SIGNING_CERT ]; then
668677
echo "Error: SONiC SECURE_UPGRADE_SIGNING_CERT=$SECURE_UPGRADE_SIGNING_CERT key missing"
669678
exit 1
670679
fi
671680

672681
if [[ $SECURE_UPGRADE_MODE == 'dev' ]]; then
673-
# development signing & verification
682+
# development signing & verification
674683

675684
if [ ! -f $SECURE_UPGRADE_DEV_SIGNING_KEY ]; then
676685
echo "Error: SONiC SECURE_UPGRADE_DEV_SIGNING_KEY=$SECURE_UPGRADE_DEV_SIGNING_KEY key missing"
@@ -782,7 +791,11 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
782791
## Note: -x to skip directories on different file systems, such as /proc
783792
sudo du -hsx $FILESYSTEM_ROOT
784793
sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
785-
sudo cp files/image_config/resolv-config/resolv.conf $FILESYSTEM_ROOT/etc/resolv.conf
794+
795+
## Clear DNS configuration inherited from the build server
796+
sudo rm -f $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/original
797+
sudo cp files/image_config/resolv-config/resolv.conf.head $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/head
798+
786799
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
787800

788801
# Ensure admin gid is 1000

‎build_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ generate_onie_installer_image()
8686
## Note: Don't leave blank between lines. It is single line command.
8787
./onie-mk-demo.sh $CONFIGURED_ARCH $TARGET_MACHINE $TARGET_PLATFORM-$TARGET_MACHINE-$ONIEIMAGE_VERSION \
8888
installer platform/$TARGET_MACHINE/platform.conf $output_file OS $IMAGE_VERSION $ONIE_IMAGE_PART_SIZE \
89-
$ONIE_INSTALLER_PAYLOAD
89+
$ONIE_INSTALLER_PAYLOAD $SECURE_UPGRADE_SIGNING_CERT $SECURE_UPGRADE_DEV_SIGNING_KEY
9090
}
9191

9292
# Generate asic-specific device list

‎device/arista/x86_64-arista_7050_qx32/platform.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
{
22
"chassis": {
33
"name": "DCS-7050QX-32",
4-
"components": [],
4+
"components": [
5+
{
6+
"name": "Scd(addr=0000:04:00.0)"
7+
},
8+
{
9+
"name": "Ucd90120A(addr=6-004e)"
10+
},
11+
{
12+
"name": "Ucd90160(addr=10-004e)"
13+
}
14+
],
515
"fans": [
616
{
717
"name": "fan1"

‎device/arista/x86_64-arista_7050_qx32s/platform.json

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
{
22
"chassis": {
33
"name": "DCS-7050QX-32S",
4-
"components": [],
4+
"components": [
5+
{
6+
"name": "Aboot()"
7+
},
8+
{
9+
"name": "Scd(addr=0000:02:00.0)"
10+
},
11+
{
12+
"name": "Ucd90120A(addr=4-004e)"
13+
},
14+
{
15+
"name": "Ucd90120A(addr=8-004e)"
16+
},
17+
{
18+
"name": "CrowSysCpld(addr=2-0023)"
19+
}
20+
],
521
"fans": [],
622
"fan_drawers": [
723
{

‎device/dell/x86_64-dell_s6100_c2538-r0/installer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CONSOLE_PORT=0x2f8
22
CONSOLE_DEV=1
3-
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12"
3+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12 logs_inram=on"

‎device/mellanox/x86_64-mlnx_msn2700-r0/installer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
1+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq logs_inram=on"

‎device/nokia/armhf-nokia_ixs7215_52x-r0/installer.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
VAR_LOG_SIZE=4096
2+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="logs_inram=on"

‎device/virtual/x86_64-kvm_x86_64-r0/NPU/sai_npu.profile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_NPU
2+
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
3+
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
4+
SAI_VS_CORE_PORT_INDEX_MAP_FILE=/usr/share/sonic/hwsku/coreportindexmap.ini
5+
SAI_VS_INTERFACE_FABRIC_LANE_MAP_FILE=/usr/share/sonic/hwsku/fabriclanemap.ini

‎dockers/docker-database/docker-database-init.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,8 @@ do
9595
fi
9696
done
9797

98+
TZ=$(cat /etc/timezone)
99+
rm -rf /etc/localtime
100+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
101+
98102
exec /usr/local/bin/supervisord

‎dockers/docker-dhcp-relay/start.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ then
1010
${CTR_SCRIPT} -f dhcp_relay -o ${RUNTIME_OWNER} -v ${IMAGE_VERSION}
1111
fi
1212

13+
TZ=$(cat /etc/timezone)
14+
rm -rf /etc/localtime
15+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
16+
1317
# If our supervisor config has entries in the "dhcp-relay" group...
1418
if [ $(supervisorctl status | grep -c "^dhcp-relay:") -gt 0 ]; then
1519
# Wait for all interfaces to come up and be assigned IPv4 addresses before

‎dockers/docker-eventd/start.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ if [ "${RUNTIME_OWNER}" == "" ]; then
44
RUNTIME_OWNER="kube"
55
fi
66

7+
TZ=$(cat /etc/timezone)
8+
rm -rf /etc/localtime
9+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime

‎dockers/docker-fpm-frr/docker_init.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,8 @@ chmod 0755 /usr/sbin/bgp-unisolate
106106
mkdir -p /var/sonic
107107
echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
108108

109+
TZ=$(cat /etc/timezone)
110+
rm -rf /etc/localtime
111+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
112+
109113
exec /usr/local/bin/supervisord

‎dockers/docker-iccpd/start.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ sonic-cfggen -d -t /usr/share/sonic/templates/iccpd.j2 > $ICCPD_CONF_PATH/iccpd.
1010

1111
mkdir -p /var/sonic
1212
echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
13+
14+
TZ=$(cat /etc/timezone)
15+
rm -rf /etc/localtime
16+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime

‎dockers/docker-lldp/lldpmgrd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ try:
2323
from sonic_py_common import daemon_base
2424
from swsscommon import swsscommon
2525
from sonic_py_common.interface import inband_prefix, recirc_prefix
26+
from sonic_py_common import device_info
27+
2628
except ImportError as err:
2729
raise ImportError("%s - required module not found" % str(err))
2830

@@ -357,7 +359,8 @@ def run_cmd(self, cmd):
357359

358360
def check_timeout(self, start_time):
359361
if time.time() - start_time > PORT_INIT_TIMEOUT:
360-
self.log_error("Port init timeout reached ({} seconds), resuming lldpd...".format(PORT_INIT_TIMEOUT))
362+
if device_info.is_frontend_port_present_in_host():
363+
self.log_error("Port init timeout reached ({} seconds), resuming lldpd...".format(PORT_INIT_TIMEOUT))
361364
return True
362365
return False
363366

‎dockers/docker-lldp/start.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ mkdir -p /var/sonic
2222
echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
2323

2424
rm -f /var/run/lldpd.socket
25+
26+
TZ=$(cat /etc/timezone)
27+
rm -rf /etc/localtime
28+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime

‎dockers/docker-macsec/start.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
#!/usr/bin/env bash
22

3+
TZ=$(cat /etc/timezone)
4+
rm -rf /etc/localtime
5+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
6+

‎dockers/docker-macsec/supervisord.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,17 @@ stdout_logfile=syslog
2828
stderr_logfile=syslog
2929
dependent_startup=true
3030

31+
[program:start]
32+
command=/usr/bin/start.sh
33+
priority=2
34+
autostart=false
35+
autorestart=false
36+
startsecs=0
37+
stdout_logfile=syslog
38+
stderr_logfile=syslog
39+
dependent_startup=true
40+
dependent_startup_wait_for=rsyslogd:running
41+
3142
[program:macsecmgrd]
3243
command=/usr/bin/macsecmgrd
3344
priority=2

‎dockers/docker-mux/docker-init.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
# Generate supervisord config file
44
mkdir -p /etc/supervisor/conf.d/
55

6+
TZ=$(cat /etc/timezone)
7+
rm -rf /etc/localtime
8+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
9+
610
# The docker container should start this script as PID 1, so now that supervisord is
711
# properly configured, we exec supervisord so that it runs as PID 1 for the
812
# duration of the container's lifetime

‎dockers/docker-nat/start.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
rm -f /var/run/nat/*
44

55
mkdir -p /var/warmboot/nat
6+
7+
TZ=$(cat /etc/timezone)
8+
rm -rf /etc/localtime
9+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime

‎dockers/docker-orchagent/docker-init.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,8 @@ if [ -f "$IS_SUPERVISOR" ]; then
7171
fi
7272
fi
7373

74+
TZ=$(cat /etc/timezone)
75+
rm -rf /etc/localtime
76+
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
77+
7478
exec /usr/local/bin/supervisord

0 commit comments

Comments
 (0)