From 4a0b757dc7cd7847b82259ced04c27d9d0791467 Mon Sep 17 00:00:00 2001 From: David Krauser Date: Thu, 12 Dec 2019 11:43:23 -0500 Subject: [PATCH] Properly setup the chroot before using the network in buildd hook. --- debian/changelog | 6 ++++++ live-build/buildd/hooks/48-policy-rc-d.binary | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index 63baa1aa..30a44afa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.634) UNRELEASED; urgency=medium + + * Properly setup the chroot before using the network. + + -- David Krauser Thu, 12 Dec 2019 13:50:58 -0400 + livecd-rootfs (2.633) focal; urgency=medium * Snapd for uc20 model assertions does not support global channel overrides. diff --git a/live-build/buildd/hooks/48-policy-rc-d.binary b/live-build/buildd/hooks/48-policy-rc-d.binary index fb3c481b..5d3b73dc 100755 --- a/live-build/buildd/hooks/48-policy-rc-d.binary +++ b/live-build/buildd/hooks/48-policy-rc-d.binary @@ -1,7 +1,18 @@ #!/bin/sh + set -e # This is run after 02-disk-image-uefi.binary because # we don't want policyrcd-script-zg2 installed in # bootable images. + +. config/functions + +cleanup() { + teardown_mountpoint chroot +} +trap cleanup EXIT + +setup_mountpoint chroot + chroot chroot apt-get install -y policyrcd-script-zg2