Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-13 14:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken DNS in buildd image builds.

Browse Source 
Instead of injecting an empty resolv.conf with an includes.chroot, we'll
inject it in late with a hook. The empty resolv.conf breaks DNS early in
the build, and causes some binary hooks to fail
This commit is contained in:
Cody Shepherd 2020-02-12 10:39:02 -08:00
parent a29e886fe1
commit 9b1fe7a820
No known key found for this signature in database
GPG Key ID: 0DB7E5F05C3FAB5F
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
live-build/buildd/hooks/49-policy-rc-d.binary → live-build/buildd/hooks/48-policy-rc-d.binary Normal file → Executable file
View File

4
live-build/buildd/hooks/49-empty-resolv-conf.binary Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
set -e
chroot chroot truncate -s 0 /etc/resolv.conf

4
live-build/buildd/hooks/52-linux-virtual-image.binary
View File

@ -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