Diff comments:
> diff --git a/live-build/auto/build b/live-build/auto/build
> index 70287ba..e9f2096 100755
> --- a/live-build/auto/build
> +++ b/live-build/auto/build
> @@ -387,93 +320,89 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
> #
> @@EOF
>
> - cp chroot/etc/apt/sources.list chroot/etc/apt/sources.list.orig
> - cp chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list
> -
> - echo "Waiting on gnupg ("$GPG_PROCESS") to finish generating a key."
> - wait $GPG_PROCESS
> -
> - R_ORIGIN=$(lsb_release -i -s)
> - R_CODENAME=$(lsb_release -c -s)
> - R_VERSION=$(lsb_release -r -s)
> - R_PRETTYNAME=$(echo $R_CODENAME | sed -e 's/^\(.\)/\U\1/')
> -
> - apt-ftparchive -o APT::FTPArchive::Release::Origin=$R_ORIGIN \
> - -o APT::FTPArchive::Release::Label=$R_ORIGIN \
> - -o APT::FTPArchive::Release::Suite=$R_CODENAME-local \
> - -o APT::FTPArchive::Release::Version=$R_VERSION \
> - -o APT::FTPArchive::Release::Codename=$R_CODENAME \
> - -o APT::FTPArchive::Release::Description="$R_ORIGIN $R_PRETTYNAME Local" \
> - release chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/ \
> - > config/gnupg/Release
> -
> - gpg --home config/gnupg --detach-sign --armor config/gnupg/Release
> - mv config/gnupg/Release \
> - chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release
> - mv config/gnupg/Release.asc \
> - chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release.gpg
> - apt-key --keyring chroot/etc/apt/trusted.gpg add config/gnupg/pubring.gpg
> - find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm
> -
> - Chroot chroot "apt-get update"
> - cat chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig \
> - > chroot/etc/apt/sources.list
> - rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig
> - fi
> - case $PROJECT:$SUBPROJECT in
> - *)
> - if [ -e "config/seeded-snaps" ]; then
> - snap_list=$(cat config/seeded-snaps)
> - preinstall_snaps $snap_list
> - fi
> - ;;
> - esac
> -
> - if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
> - if [ "$ARCH" = "armhf" ]; then
> - INFO_DESC="$(lsb_release -d -s)"
> - echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
> - mkdir -p chroot/var/log/installer
> - Chroot chroot "ln -s /etc/media-info /var/log/installer/media-info"
> + cp chroot/etc/apt/sources.list chroot/etc/apt/sources.list.orig
> + cp chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list
> +
> + echo "Waiting on gnupg ("$GPG_PROCESS") to finish generating a key."
> + wait $GPG_PROCESS
> +
> + R_ORIGIN=$(lsb_release -i -s)
> + R_CODENAME=$(lsb_release -c -s)
> + R_VERSION=$(lsb_release -r -s)
> + R_PRETTYNAME=$(echo $R_CODENAME | sed -e 's/^\(.\)/\U\1/')
> +
> + apt-ftparchive -o APT::FTPArchive::Release::Origin=$R_ORIGIN \
> + -o APT::FTPArchive::Release::Label=$R_ORIGIN \
> + -o APT::FTPArchive::Release::Suite=$R_CODENAME-local \
> + -o APT::FTPArchive::Release::Version=$R_VERSION \
> + -o APT::FTPArchive::Release::Codename=$R_CODENAME \
> + -o APT::FTPArchive::Release::Description="$R_ORIGIN $R_PRETTYNAME Local" \
> + release chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/ \
> + > config/gnupg/Release
> +
> + gpg --home config/gnupg --detach-sign --armor config/gnupg/Release
> + mv config/gnupg/Release \
> + chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release
> + mv config/gnupg/Release.asc \
> + chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release.gpg
> + apt-key --keyring chroot/etc/apt/trusted.gpg add config/gnupg/pubring.gpg
> + find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm
> +
> + Chroot chroot "apt-get update"
> + cat chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig \
> + > chroot/etc/apt/sources.list
> + rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig
> fi
> - fi
> - if [ "$PROJECT" = "ubuntu-cpc" ]; then
> - if [ "${SUBPROJECT:-}" = minimized ]; then
> - BUILD_NAME=minimal
> - else
> - BUILD_NAME=server
> + case $PROJECT:$SUBPROJECT in
> + ubuntu-server:live)
> + lb chroot_resolv install
I built ubuntu-server:live with your branch and the base filesystem did *not* get lxd seeded. So I'm going to try reverting the snippet I complained about and if it helps merge that. If that still doesn't work, you're going to have to fix it :)
> + snap_prepare chroot
> + lb chroot_resolv remove
> + ;;
> + *)
> + if [ -e "config/seeded-snaps" ]; then
> + snap_list=$(cat config/seeded-snaps)
> + preinstall_snaps $snap_list
> + fi
> + ;;
> + esac
> +
> + if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
> + if [ "$ARCH" = "armhf" ]; then
> + INFO_DESC="$(lsb_release -d -s)"
> + echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
> + mkdir -p chroot/var/log/installer
> + Chroot chroot "ln -s /etc/media-info /var/log/installer/media-info"
> + fi
> fi
> - cat > chroot/etc/cloud/build.info << EOF
> + if [ "$PROJECT" = "ubuntu-cpc" ]; then
> + if [ "${SUBPROJECT:-}" = minimized ]; then
> + BUILD_NAME=minimal
> + else
> + BUILD_NAME=server
> + fi
> + cat > chroot/etc/cloud/build.info << EOF
> build_name: $BUILD_NAME
> serial: $BUILDSTAMP
> EOF
> + fi
> +
> + configure_network_manager
> +
> + echo "===== Checking size of /usr/share/doc ====="
> + echo BEGIN docdirs
> + (cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr)
> + echo END docdirs
> +
> + /usr/share/livecd-rootfs/minimize-manual chroot
> fi
>
> - # If the image pre-installs network-manager, let it manage all devices by
> - # default. Installing NM on an existing system only manages wifi and wwan via
> - # /usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf. When setting
> - # the global backend to NM, netplan overrides that file.
> - if [ -e chroot/usr/sbin/NetworkManager ]; then
> - echo "===== Enabling all devices in NetworkManager ===="
> - mkdir -p chroot/etc/netplan
> - cat <<EOF > chroot/etc/netplan/01-network-manager-all.yaml
> -# Let NetworkManager manage all devices on this system
> -network:
> - version: 2
> - renderer: NetworkManager
> -EOF
> + if [ -n "${PASSES}" ]; then
> + PATH="config/:$PATH" lb binary_layered "$@"
> else
> - echo "==== NetworkManager not installed ===="
> + lb binary "$@"
> fi
>
> - echo "===== Checking size of /usr/share/doc ====="
> - echo BEGIN docdirs
> - (cd chroot && find usr/share/doc -maxdepth 1 -type d | xargs du -s | sort -nr)
> - echo END docdirs
> -
> - /usr/share/livecd-rootfs/minimize-manual chroot
> -
> - lb binary "$@"
> touch binary.success
> ) 2>&1 | tee binary.log
>
--
https://code.launchpad.net/~jibel/livecd-rootfs/+git/add_multi_layered_squashfses_support/+merge/360878
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.