Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-31 04:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run snap info on the downloaded snap, rather than against the store. First of all snap info doesn't have --channel argument, thus queries the wrong channel, and depening on the cohort, a different snap might be visible too. Thus seed the base of the snap revision we dowanloaded, rather than some random one from the store.

Browse Source
This commit is contained in:
Dimitri John Ledkov 2020-04-17 00:10:35 +01:00
parent 28b531d1ea
commit ad64e38c48
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.663) UNRELEASED; urgency=medium
* Run snap info on the downloaded snap, rather than against the
store. First of all snap info doesn't have --channel argument, thus
queries the wrong channel, and depening on the cohort, a different
snap might be visible too. Thus seed the base of the snap revision we
dowanloaded, rather than some random one from the store.
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 17 Apr 2020 00:00:52 +0100
livecd-rootfs (2.662) focal; urgency=medium livecd-rootfs (2.662) focal; urgency=medium
* Print subiquity ssh login details on s390x line based consoles. * Print subiquity ssh login details on s390x line based consoles.

57
live-build/functions
View File

@ -482,34 +482,6 @@ _snap_preseed() {
return return
fi fi
# Pre-seed snap's base
case $SNAP_NAME in
snapd)
# snapd is self-contained, ignore base
;;
core|core[0-9][0-9])
# core and core## are self-contained, ignore base
;;
*)
# Determine which core snap is needed
local snap_info
snap_info=$(snap info --verbose "${SNAP_NAME}")
if [ $? -ne 0 ]; then
echo "Failed to retrieve base of $SNAP_NAME!"
exit 1
fi
local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}')
# If snap info does not list a base use 'core'
core_snap=${core_snap:-core}
_snap_preseed $CHROOT_ROOT $core_snap stable
;;
esac
sh -c " sh -c "
set -x; set -x;
cd \"$CHROOT_ROOT/var/lib/snapd/seed\"; cd \"$CHROOT_ROOT/var/lib/snapd/seed\";
@ -528,6 +500,35 @@ _snap_preseed() {
mv -v $seed_dir/*.assert $assertions_dir mv -v $seed_dir/*.assert $assertions_dir
mv -v $seed_dir/*.snap $snaps_dir mv -v $seed_dir/*.snap $snaps_dir
# Pre-seed snap's base
case $SNAP_NAME in
snapd)
# snapd is self-contained, ignore base
;;
core|core[0-9][0-9])
# core and core## are self-contained, ignore base
;;
*)
# Determine which core snap is needed
local snap_info
# snap info doesn't have --channel, so must run agains the downloaded snap
snap_info=$(snap info --verbose ${snaps_dir}/${SNAP_NAME}_[0-9]*.snap)
if [ $? -ne 0 ]; then
echo "Failed to retrieve base of $SNAP_NAME!"
exit 1
fi
local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}')
# If snap info does not list a base use 'core'
core_snap=${core_snap:-core}
_snap_preseed $CHROOT_ROOT $core_snap stable
;;
esac
# Add the snap to the seed.yaml # Add the snap to the seed.yaml
! [ -e $seed_yaml ] && echo "snaps:" > $seed_yaml ! [ -e $seed_yaml ] && echo "snaps:" > $seed_yaml
cat <<EOF >> $seed_yaml cat <<EOF >> $seed_yaml