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 @@ -400,7 +400,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
400
400
jq \
401
401
auditd \
402
402
linux-perf \
403
- resolvconf \
404
403
lsof \
405
404
sysstat
406
405
@@ -759,11 +758,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
759
758
# # Note: -x to skip directories on different file systems, such as /proc
760
759
sudo du -h sx $FILESYSTEM_ROOT
761
760
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
767
762
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -c omp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
768
763
769
764
# 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