diff --git a/live-build/buildd/hooks/49-policy-rc-d.binary b/live-build/buildd/hooks/48-policy-rc-d.binary old mode 100644 new mode 100755 similarity index 100% rename from live-build/buildd/hooks/49-policy-rc-d.binary rename to live-build/buildd/hooks/48-policy-rc-d.binary diff --git a/live-build/buildd/hooks/49-empty-resolv-conf.binary b/live-build/buildd/hooks/49-empty-resolv-conf.binary new file mode 100755 index 00000000..df4a9b9a --- /dev/null +++ b/live-build/buildd/hooks/49-empty-resolv-conf.binary @@ -0,0 +1,4 @@ +#!/bin/sh +set -e + +chroot chroot truncate -s 0 /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 000eebc1..f373136b 100755 --- a/live-build/buildd/hooks/52-linux-virtual-image.binary +++ b/live-build/buildd/hooks/52-linux-virtual-image.binary @@ -27,10 +27,6 @@ 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