From f026177dc6f2b2b71bf4147eab04e4658224247f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 29 Jan 2021 01:35:33 +0100 Subject: [PATCH] Fix PROPOSED=1 not enabling proposed for all needed components --- debian/changelog | 8 ++++++++ live-build/auto/config | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6eb04635..695e49b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.711) UNRELEASED; urgency=medium + + * auto/config: when running with PROPOSED=1, enable -proposed for all the + components we listed as required and not just the default set (main, + restricted). + + -- Łukasz 'sil2100' Zemczak Fri, 29 Jan 2021 01:33:07 +0100 + livecd-rootfs (2.710) hirsute; urgency=medium * esp: install grub in ubuntu bootloader id path, instead of removable. diff --git a/live-build/auto/config b/live-build/auto/config index b8c6e7ab..20bfd048 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1166,7 +1166,7 @@ if [ "$PROPOSED" ]; then . config/bootstrap cat > config/archives/proposed.list.chroot << EOF -deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed $LB_PARENT_ARCHIVE_AREAS +deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed ${COMPONENTS:-${LB_PARENT_ARCHIVE_AREAS}} EOF cp -a config/archives/proposed.list.chroot \ config/archives/proposed.list.binary