[Merge] lp:~codyshepherd/livecd-rootfs/snaps-manifest into lp:livecd-rootfs

[Steve Langasek]

Review: Needs Fixing



Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2018-10-12 12:19:18 +0000
> +++ debian/changelog	2018-10-22 17:41:10 +0000
> @@ -1,3 +1,9 @@
> +livecd-rootfs (2.543) cosmic; urgency=medium

This will need to be uploaded to dd when it opens, so please leave the upload target as 'UNRELEASED' for this branch instead of 'cosmic'.

> +
> +  * Ensure pre-seeded snaps are now published in the image manifests.
> +
> + -- Cody Shepherd <cody.shepherd at canonical.com>  Mon, 22 Oct 2018 10:16:19 -0700
> +
>  livecd-rootfs (2.542) cosmic; urgency=medium
>  
>    * Decide what model assertion series to fetch depending on the suite. Use 16
> 
> === modified file 'live-build/auto/build'
> --- live-build/auto/build	2018-09-26 00:42:42 +0000
> +++ live-build/auto/build	2018-10-22 17:41:10 +0000
> @@ -551,6 +551,7 @@
>  
>  # '--initramfs none' produces different manifest names.
>  if [ -e "binary/$INITFS/filesystem.packages" ]; then
> +	/build/config/snap-seed-parse "chroot/" >> "binary/${INITFS}/filesystem.packages"

This is the only place in the livecd-rootfs tree where we are hard-coding /build as a path.  I would suggest this should be a relative path (./config/snap-seed-parse) consistent with the other usage.

>  	ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
>  	chmod 644 "$PREFIX.manifest"
>  fi
> 
> === modified file 'live-build/functions'
> --- live-build/functions	2018-09-27 20:15:55 +0000
> +++ live-build/functions	2018-10-22 17:41:10 +0000
> @@ -43,6 +43,17 @@
>      dd if=/dev/zero of="$1" bs=1 count=0 seek="${imagesize}"
>  }
>  
> +create_manifest() {
> +    local chroot_root=${1}
> +    local target_file=${2}
> +    echo "create_manifest chroot_root: ${chroot_root}"
> +    dpkg-query --show --admindir="${chroot_root}/var/lib/dpkg" > ${target_file}
> +    echo "create_manifest call to dpkg-query finished."
> +    /build/config/snap-seed-parse "${chroot_root}" >> ${target_file}

./config/snap-seed-parse

> +    echo "create_manifest call to snap_seed_parse finished."
> +    echo "create_manifest finished"
> +}
> +
>  make_ext4_partition() {
>      device="$1"
>      label=${fs_label:+-L "${fs_label}"}


-- 
https://code.launchpad.net/~codyshepherd/livecd-rootfs/snaps-manifest/+merge/357652
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~codyshepherd/livecd-rootfs/snaps-manifest into lp:livecd-rootfs.