From 0684e5c9ee9fc8f1b0de7d651cf4c50af4c21c56 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Wed, 1 Apr 2020 09:11:29 +0000 Subject: [PATCH] Imported 2.656 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/buildd/hooks/49-empty-resolv-conf.binary | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12684083..74fc91e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.656) focal; urgency=medium + + [ David Krauser ] + * Safely set /etc/resolv.conf to an empty file in buildd images + + -- Robert C Jennings Tue, 31 Mar 2020 09:56:13 -0500 + livecd-rootfs (2.655) focal; urgency=medium * minimized: reinstall packages one by one, instead of all of them diff --git a/live-build/buildd/hooks/49-empty-resolv-conf.binary b/live-build/buildd/hooks/49-empty-resolv-conf.binary index df4a9b9a..a6f97526 100755 --- a/live-build/buildd/hooks/49-empty-resolv-conf.binary +++ b/live-build/buildd/hooks/49-empty-resolv-conf.binary @@ -1,4 +1,3 @@ -#!/bin/sh -set -e - -chroot chroot truncate -s 0 /etc/resolv.conf +#!/bin/sh -e +chroot chroot rm /etc/resolv.conf +chroot chroot touch /etc/resolv.conf