Skip to content

Commit f621643

Browse files
authored
Revert "Clear DNS configuration received from DHCP during networking reconfiguration in Linux. (#13516)" (#14901)
This reverts commit 5ef488f.
1 parent 6ba666e commit f621643

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
@@ -388,7 +388,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
388388
jq \
389389
auditd \
390390
linux-perf \
391-
resolvconf \
392391
lsof \
393392
sysstat
394393

@@ -679,11 +678,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
679678
## Note: -x to skip directories on different file systems, such as /proc
680679
sudo du -hsx $FILESYSTEM_ROOT
681680
sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
682-
683-
## Clear DNS configuration inherited from the build server
684-
sudo rm -f $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/original
685-
sudo cp files/image_config/resolv-config/resolv.conf.head $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/head
686-
681+
sudo cp files/image_config/resolv-config/resolv.conf $FILESYSTEM_ROOT/etc/resolv.conf
687682
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
688683

689684
# 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)