Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 09:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Ubuntu-specific branches when seeding snaps, as required in

Browse Source 
<https://wiki.ubuntu.com/UbuntuSeededSnaps>.
This commit is contained in:
Steve Langasek 2018-02-16 14:09:03 -08:00
parent f054c56bec
commit 131f14d33c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.504) UNRELEASED; urgency=medium
* Use Ubuntu-specific branches when seeding snaps, as required in
<https://wiki.ubuntu.com/UbuntuSeededSnaps>.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 16 Feb 2018 14:02:49 -0800
livecd-rootfs (2.503) bionic; urgency=medium livecd-rootfs (2.503) bionic; urgency=medium
* Install linux-signed-generic in the live-server image. (LP: #1749065) * Install linux-signed-generic in the live-server image. (LP: #1749065)

6
live-build/auto/build
View File

@ -35,6 +35,8 @@ Setup_cleanup
preinstall_snaps() { preinstall_snaps() {
lb chroot_resolv install lb chroot_resolv install
snap_channel="stable/ubuntu-$(distro-info --series="$LB_DISTRIBUTION" \
-r | awk '{ print $1 }')"
chroot chroot sh -c ' chroot chroot sh -c '
set -x; set -x;
cd /var/lib/snapd/seed; cd /var/lib/snapd/seed;
@ -43,7 +45,7 @@ preinstall_snaps() {
chroot chroot sh -c " chroot chroot sh -c "
set -x; set -x;
cd /var/lib/snapd/seed; cd /var/lib/snapd/seed;
SNAPPY_STORE_NO_CDN=1 snap download \"${snap%/*}\"" SNAPPY_STORE_NO_CDN=1 snap download --channel=$snap_channel \"${snap%/*}\""
done done
lb chroot_resolv remove lb chroot_resolv remove
@ -59,7 +61,7 @@ EOF
snap_name=${snap%/*} snap_name=${snap%/*}
cat <<EOF >> chroot/var/lib/snapd/seed/seed.yaml cat <<EOF >> chroot/var/lib/snapd/seed/seed.yaml
- name: ${snap_name} - name: ${snap_name}
channel: stable channel: $snap_channel
EOF EOF
case ${snap} in */classic) echo " classic: true" >> chroot/var/lib/snapd/seed/seed.yaml;; esac case ${snap} in */classic) echo " classic: true" >> chroot/var/lib/snapd/seed/seed.yaml;; esac
echo -n " file: " >> chroot/var/lib/snapd/seed/seed.yaml echo -n " file: " >> chroot/var/lib/snapd/seed/seed.yaml