From 6a05e7fa222b7dd166de3b74ab33c88609492f84 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Fri, 5 Nov 2021 17:51:52 +0100 Subject: [PATCH] Install desired already seeded snap in wsl. As wsl is an image target of ubuntu-cpc, the base seed is hardcoded to ubuntu-server instead of wsl one. For now, add it, as for the other cpc images, in hooks. --- live-build/ubuntu-cpc/hooks.d/base/wsl.binary | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/live-build/ubuntu-cpc/hooks.d/base/wsl.binary b/live-build/ubuntu-cpc/hooks.d/base/wsl.binary index 8ce28140..3c2c589a 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/wsl.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/wsl.binary @@ -37,6 +37,13 @@ setup_mountpoint $rootfs_dir env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get autoremove --purge --assume-yes +# Install snap manually for now as config on cpc always assume the same base seed for every flavors +env UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 chroot $rootfs_dir snap download --target-directory=/var/lib/snapd/snaps core20 +env UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 chroot $rootfs_dir snap download --target-directory=/var/lib/snapd/snaps gtk-common-themes +env UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 chroot $rootfs_dir snap download --target-directory=/var/lib/snapd/snaps --channel=latest/edge ubuntu-desktop-installer + + + create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest teardown_mountpoint $rootfs_dir