Imported 2.632

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.632) focal; urgency=medium
+
+  [ David Krauser ]
+  * Fix broken DNS in buildd image builds.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 12 Dec 2019 10:34:55 +1300
+
 livecd-rootfs (2.631) focal; urgency=medium
 
   * Add support for uc20 model assertions.

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

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