Skip to content

Commit 72c52bc

Browse files
authored
Revert "Clear DNS configuration received from DHCP during networking reconfiguration in Linux. (#13516)" (#14902)
This reverts commit c7ecd92.
1 parent 865605e commit 72c52bc

File tree

4 files changed

+1
-11
lines changed

4 files changed

+1
-11
lines changed

build_debian.sh

+1-6
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
400400
jq \
401401
auditd \
402402
linux-perf \
403-
resolvconf \
404403
lsof \
405404
sysstat
406405

@@ -759,11 +758,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
759758
## Note: -x to skip directories on different file systems, such as /proc
760759
sudo du -hsx $FILESYSTEM_ROOT
761760
sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
762-
763-
## Clear DNS configuration inherited from the build server
764-
sudo rm -f $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/original
765-
sudo cp files/image_config/resolv-config/resolv.conf.head $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/head
766-
761+
sudo cp files/image_config/resolv-config/resolv.conf $FILESYSTEM_ROOT/etc/resolv.conf
767762
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
768763

769764
# Ensure admin gid is 1000

files/image_config/interfaces/interfaces-config.sh

-3
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ for intf_pid in $(ls -1 /var/run/dhclient*.Ethernet*.pid 2> /dev/null); do
6060
[[ -f ${intf_pid} ]] && kill `cat ${intf_pid}` && rm -f ${intf_pid}
6161
done
6262

63-
[[ -f /var/run/resolvconf/interface/eth0.dhclient ]] && rm -f /var/run/resolvconf/interface/eth0.dhclient
64-
[[ -f /var/run/resolvconf/interface/eth0.ip6.dhclient ]] && rm -f /var/run/resolvconf/interface/eth0.ip6.dhclient
65-
6663
# Read sysctl conf files again
6764
sysctl -p /etc/sysctl.d/90-dhcp6-systcl.conf
6865

files/image_config/resolv-config/resolv.conf

Whitespace-only changes.

files/image_config/resolv-config/resolv.conf.head

-2
This file was deleted.

0 commit comments

Comments
 (0)