Revert "Clear DNS configuration received from DHCP during networking reconfiguration in Linux. (#13516)" (#14902)
This reverts commit c7ecd92c54
.
This commit is contained in:
parent
865605ef76
commit
72c52bc677
@ -400,7 +400,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
|
||||
jq \
|
||||
auditd \
|
||||
linux-perf \
|
||||
resolvconf \
|
||||
lsof \
|
||||
sysstat
|
||||
|
||||
@ -759,11 +758,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
|
||||
## Note: -x to skip directories on different file systems, such as /proc
|
||||
sudo du -hsx $FILESYSTEM_ROOT
|
||||
sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
|
||||
|
||||
## Clear DNS configuration inherited from the build server
|
||||
sudo rm -f $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/original
|
||||
sudo cp files/image_config/resolv-config/resolv.conf.head $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/head
|
||||
|
||||
sudo cp files/image_config/resolv-config/resolv.conf $FILESYSTEM_ROOT/etc/resolv.conf
|
||||
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
|
||||
|
||||
# Ensure admin gid is 1000
|
||||
|
@ -60,9 +60,6 @@ for intf_pid in $(ls -1 /var/run/dhclient*.Ethernet*.pid 2> /dev/null); do
|
||||
[[ -f ${intf_pid} ]] && kill `cat ${intf_pid}` && rm -f ${intf_pid}
|
||||
done
|
||||
|
||||
[[ -f /var/run/resolvconf/interface/eth0.dhclient ]] && rm -f /var/run/resolvconf/interface/eth0.dhclient
|
||||
[[ -f /var/run/resolvconf/interface/eth0.ip6.dhclient ]] && rm -f /var/run/resolvconf/interface/eth0.ip6.dhclient
|
||||
|
||||
# Read sysctl conf files again
|
||||
sysctl -p /etc/sysctl.d/90-dhcp6-systcl.conf
|
||||
|
||||
|
0
files/image_config/resolv-config/resolv.conf
Normal file
0
files/image_config/resolv-config/resolv.conf
Normal file
@ -1,2 +0,0 @@
|
||||
# Dynamic resolv.conf(5) file generated by resolvconf(8)
|
||||
# The content of this file may be overwritten during a config reload.
|
Loading…
Reference in New Issue
Block a user