From 3bf032853b3a3d453a9fba0f834d86bf332a41a7 Mon Sep 17 00:00:00 2001 From: David Krauser Date: Fri, 8 Nov 2019 11:59:40 -0500 Subject: [PATCH] Include empty resolv.conf only in buildd lxd tarballs. --- live-build/buildd/hooks/52-linux-virtual-image.binary | 4 ++++ live-build/buildd/includes.chroot/etc/resolv.conf | 0 2 files changed, 4 insertions(+) create mode 100644 live-build/buildd/includes.chroot/etc/resolv.conf 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 diff --git a/live-build/buildd/includes.chroot/etc/resolv.conf b/live-build/buildd/includes.chroot/etc/resolv.conf new file mode 100644 index 00000000..e69de29b