Fix logic to ensure snapd is seeded in core18-only images

The _snap_post_process function is meant to install snapd if core18 is the
only core snap installed or removed snapd if core is installed and snapd
was not explicitly installed.  But the current logic in _snap_preseed
will never call _snap_post_process.  $core_name will never be empty
with the existing logic, but even if it were that would only be for the
'core' snap and we'd miss using the 'core18' logic that pulls in snapd.
Given the case statement in _snap_post_process can handle doing the
right thing given any snap we can just call it unconditionally.
xnox/lp-uc20-8gb
Robert C Jennings 5 years ago
parent 50f3d90c9f
commit 14066ce389
No known key found for this signature in database
GPG Key ID: 740C3D9EEDF2ED73

@ -541,11 +541,7 @@ EOF
echo -n " file: " >> $seed_yaml echo -n " file: " >> $seed_yaml
(cd $snaps_dir; ls -1 ${SNAP_NAME}_*.snap) >> $seed_yaml (cd $snaps_dir; ls -1 ${SNAP_NAME}_*.snap) >> $seed_yaml
# If $core_snap is the empty string then SNAP itself *may be* a core snap,
# and we run some post-processing logic.
if [ -z "$core_snap" ]; then
_snap_post_process $CHROOT_ROOT $SNAP_NAME _snap_post_process $CHROOT_ROOT $SNAP_NAME
fi
} }
snap_prepare_assertions() { snap_prepare_assertions() {

Loading…
Cancel
Save