[Merge] ~dbungert/livecd-rootfs:choose-channel into livecd-rootfs:ubuntu/master

Ɓukasz Zemczak mp+444812 at code.launchpad.net
Fri Jun 16 14:45:59 UTC 2023


So first addressing Michael's comments inline.

Diff comments:

> diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary
> index 3083e3d..befa36e 100644
> --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary
> +++ b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary
> @@ -107,7 +107,12 @@ Ekm0W8qT4AT0GSk5CY8kx+UvCn6FLxMuv8xjWoX3OLcQx31yO6Uy6c2LN6nSlovDghKP5V1KvlKl
>  WiXM9CPKCZv/Es3uOp/ke0wWL7v0MZhzUJ+QhOtTNg==
>  EOF
>  
> -env SNAPPY_STORE_NO_CDN=1 snap prepare-image --classic config/classic-model.model chroot
> +channel=""
> +if [ -n "$CHANNEL" ]; then
> +    channel="--channel $CHANNEL"
> +fi
> +env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
> +    --classic config/classic-model.model $channel chroot

Yes, it affects all. The reason is that we're mirroring the behaviour we already have for core images already - when you pass CHANNEL= to a ubuntu-core build, ALL snaps are switched to the given channel. I thought that just making the installer respect the CHANNEL argument and not others would be very very confusing - we'd have to pass INSTALLER_CHANNEL or something for this to be more explicit. Or passing an array of "snap=channel" via livefs, but that's more involving and we never did that before.

>  mv chroot/system-seed/systems/* chroot/system-seed/systems/enhanced-secureboot-desktop
>  rsync -a chroot/system-seed/ chroot/var/lib/snapd/seed
>  rm -rf chroot/system-seed/


-- 
https://code.launchpad.net/~dbungert/livecd-rootfs/+git/livecd-rootfs/+merge/444812
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.




More information about the Ubuntu-reviews mailing list