~rcj/livecd-rootfs/+git/livecd-rootfs:bugfix/cpc_duplicate_snaps

Branch merges

Propose for merging

Merged into livecd-rootfs:ubuntu/master at revision a45342f26993cca1238330b7e622c1659dc5ddf4

Mathieu Trudel-Lapierre: Approve on 2019-04-01

Philip Roche (community): Approve on 2019-04-01

David Krauser (community): Approve on 2019-04-01

Diff: 35 lines (+11/-2)

2 files modified

debian/changelog (+6/-0)
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary (+5/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

a45342f... by Robert C Jennings on 2019-03-29

ubuntu-cpc: avoid duplicate snaps listed in qcow manifest

commit a993592 introduced an additional call to create_manifest
(and snap-seed-parse) to write binary/boot/filesystem.packages. This
caused duplicate snap lines in the qcow manifest. This is because the
live-build/auto/binary code assumes that after 'lb binary' is run the
filesystem.packages will only have debs and it calls snap-seed-parse to
add them to the file. The commit changed filesystem.packages in the
ubuntu-cpc uefi binary hook to include debs and snaps.

This patch keeps the intent of the prior patch, updating the
filesystem.packages file for the content of the uefi disk image, but
only writes a listing of debian packages to match the expected content
of filesystem.packages. The snaps will still be added in generic code
in live-build/auto/build.

2db7f01... by Dimitri John Ledkov on 2019-03-21

releasing package livecd-rootfs version 2.574

036d7d2... by Dimitri John Ledkov on 2019-03-20

Make serial-subiquity@ use the same codepath as tty1 subiquity.

Such that subiquity runs in the correct environment.
Depends on: https://github.com/CanonicalLtd/subiquity/pull/428

a44c468... by Didier Roche-Tolomelli on 2019-03-20

releasing package livecd-rootfs version 2.573

b20cf75... by Didier Roche-Tolomelli on 2019-03-20

Add languages to live pass

The name of the pass is live and not "ubuntu-live" which is the live pass
default task.

1f5c21f... by Dimitri John Ledkov on 2019-03-20

releasing package livecd-rootfs version 2.572

1ab4387... by Dimitri John Ledkov on 2019-03-20

Revert "subiquity: fix name of mdoules.squashfs to mount"

This reverts commit 98e0b1031d931cbe87f3744613f05557e3bc9acf.

2adae2e... by Dimitri John Ledkov on 2019-03-18

releasing package livecd-rootfs version 2.571

98e0b10... by Dimitri John Ledkov on 2019-03-18

subiquity: fix name of mdoules.squashfs to mount

ubuntu-cdimage/debian-cd/tools/add_live_filesystem helpfully adds a
'filesystem.' prefix to the squashfs, hence the name of the file
didn't match what's on disk.

ad4f8f7... by Didier Roche-Tolomelli on 2019-03-18

releasing package livecd-rootfs version 2.570