Review: Needs Information
Diff comments:
> diff --git a/live-build/auto/config b/live-build/auto/config
> index ac63994..2066273 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -1265,7 +1291,6 @@ lb config noauto \
> --mode ubuntu \
> --distribution "$SUITE" \
> --iso-preparer "livecd-rootfs" \
> - --bootstrap-keyring ubuntu-keyring \
How does this change relate to the rest? There seems to be no replacement elsewhere; so this implies it's an unnecessary argument?
> --binary-images "$BINARY_IMAGES" \
> --memtest "$MEMTEST" \
> $SOURCE \
> diff --git a/live-build/functions b/live-build/functions
> index 543bb3f..0177f3a 100644
> --- a/live-build/functions
> +++ b/live-build/functions
> @@ -886,11 +886,7 @@ clean_debian_chroot() {
> }
>
> configure_universe() {
> - if [ -f config/universe-enabled ]; then
> - # This is cargo-culted almost verbatim (with some syntax changes for
> - # preinstalled being slightly different in what it doesn't ask) from
> - # debian-installer's apt-setup:
> -
> + if [ -f config/universe-enabled ]; then
https://botsin.space/@scream
> cat > chroot/etc/apt/sources.list << EOF
> # Ubuntu sources have moved to the /etc/apt/sources.list.d/ubuntu.sources
> # file, which uses the deb822 format. Use deb822-formatted .sources files
> @@ -898,7 +894,8 @@ configure_universe() {
> # See the sources.list(5) manual page for details.
> EOF
>
> - cat > chroot/etc/apt/sources.list.d/ubuntu.sources << EOF
> + if [ $LB_VOLATILE = "true" ]; then
I think this warrants a comment so one doesn't have to crawl live-build documentation to understand the intent.
I see that `--volatile false` is passed for the buildd images; so is this a behavior change for those images?
> + cat > chroot/etc/apt/sources.list.d/ubuntu.sources << EOF
> # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
> # newer versions of the distribution.
>
> @@ -944,8 +941,23 @@ Suites: $LB_DISTRIBUTION-security
> Components: main universe restricted multiverse
> Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
> EOF
> -
> -fi
> + else
> + # We only expect to fall into this path when building for a rebuild archive.
> + if [ "$LB_PARENT_MIRROR_BINARY" = "http://archive.ubuntu.com/ubuntu/" ]; then
> + echo "Unexpected LB_VOLATILE=false" >&2
> + exit 1
> + fi
> + # live-build just runs apt-key add on the rebuild archive's key so we don't
> + # need to include Signed-By here. It's a bit ugly but well, hopefully we
> + # can stop using live-build before this is a real problem.
> + cat > chroot/etc/apt/sources.list.d/ubuntu.sources << EOF
> +Types: deb
> +URIs: $LB_PARENT_MIRROR_BINARY
> +Suites: $LB_DISTRIBUTION
> +Components: main universe restricted multiverse
> +EOF
> + fi
> + fi
Vague unease for overloading LB_VOLATILE in this way but I have no concrete alternative to propose.
> }
>
> configure_oci() {
--
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/425053
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.