From d74b68f9aa7b983965bb87dcb06d40cda6832ddf Mon Sep 17 00:00:00 2001 From: Cody Shepherd Date: Wed, 12 Feb 2020 10:26:04 -0800 Subject: [PATCH] Include empty resolv.conf only in buildd lxd tarballs. --- live-build/buildd/hooks/52-linux-virtual-image.binary | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/live-build/buildd/hooks/52-linux-virtual-image.binary b/live-build/buildd/hooks/52-linux-virtual-image.binary index f373136b..000eebc1 100755 --- a/live-build/buildd/hooks/52-linux-virtual-image.binary +++ b/live-build/buildd/hooks/52-linux-virtual-image.binary @@ -27,6 +27,10 @@ cleanup_linux_virtual() { } trap cleanup_linux_virtual EXIT +# The base buildd chroot includes an empty resolv.conf +# We don't want to include that in the bootable images +rm $mount_d/etc/resolv.conf + # Install dependencies env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \ update --assume-yes