File tree 4 files changed +1
-11
lines changed
4 files changed +1
-11
lines changed Original file line number Diff line number Diff line change @@ -388,7 +388,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
388
388
jq \
389
389
auditd \
390
390
linux-perf \
391
- resolvconf \
392
391
lsof \
393
392
sysstat
394
393
@@ -679,11 +678,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
679
678
# # Note: -x to skip directories on different file systems, such as /proc
680
679
sudo du -h sx $FILESYSTEM_ROOT
681
680
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
687
682
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -c omp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
688
683
689
684
# Ensure admin gid is 1000
Original file line number Diff line number Diff line change @@ -60,9 +60,6 @@ for intf_pid in $(ls -1 /var/run/dhclient*.Ethernet*.pid 2> /dev/null); do
60
60
[[ -f ${intf_pid} ]] && kill ` cat ${intf_pid} ` && rm -f ${intf_pid}
61
61
done
62
62
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
-
66
63
# Read sysctl conf files again
67
64
sysctl -p /etc/sysctl.d/90-dhcp6-systcl.conf
68
65
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments