Merge lp://staging/~rcj/livecd-rootfs/trusty-proposed_ubuntu-cpc into lp://staging/~ubuntu-core-dev/livecd-rootfs/trusty-proposed
Proposed by
Robert C Jennings
Status: | Merged |
---|---|
Approved by: | Mathieu Trudel-Lapierre |
Approved revision: | 943 |
Merged at revision: | 919 |
Proposed branch: | lp://staging/~rcj/livecd-rootfs/trusty-proposed_ubuntu-cpc |
Merge into: | lp://staging/~ubuntu-core-dev/livecd-rootfs/trusty-proposed |
Diff against target: |
2968 lines (+2588/-101) 34 files modified
debian/changelog (+142/-0) debian/copyright (+5/-1) live-build/auto/build (+43/-93) live-build/auto/config (+130/-7) live-build/ubuntu-cpc/functions (+259/-0) live-build/ubuntu-cpc/hooks/001-divert-sync.chroot_early (+11/-0) live-build/ubuntu-cpc/hooks/010-write-etc-ec2-version.chroot (+4/-0) live-build/ubuntu-cpc/hooks/020-pkg-configure.chroot (+28/-0) live-build/ubuntu-cpc/hooks/025-create-groups.chroot (+14/-0) live-build/ubuntu-cpc/hooks/030-root-tarball.binary (+32/-0) live-build/ubuntu-cpc/hooks/031-root-xz.binary (+13/-0) live-build/ubuntu-cpc/hooks/032-disk-image.binary (+124/-0) live-build/ubuntu-cpc/hooks/032-root-squashfs.binary (+19/-0) live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary (+141/-0) live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary (+79/-0) live-build/ubuntu-cpc/hooks/040-qcow2-image.binary (+23/-0) live-build/ubuntu-cpc/hooks/040-vmdk-image.binary (+22/-0) live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary (+105/-0) live-build/ubuntu-cpc/hooks/042-vagrant.binary (+221/-0) live-build/ubuntu-cpc/hooks/051-hwclock.chroot (+3/-0) live-build/ubuntu-cpc/hooks/052-ssh_authentication.chroot (+3/-0) live-build/ubuntu-cpc/hooks/060-ipv6.chroot (+18/-0) live-build/ubuntu-cpc/hooks/099-cleanup.chroot (+57/-0) live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot (+312/-0) live-build/ubuntu-cpc/hooks/999-extras.binary (+15/-0) live-build/ubuntu-cpc/hooks/999-undivert-sync.chroot (+5/-0) live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl (+180/-0) live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl (+178/-0) live-build/ubuntu-cpc/hooks/ovf/ubuntu-ovf-v1-img.tmpl (+130/-0) live-build/ubuntu-cpc/hooks/raspi2/mkknlimg (+244/-0) live-build/ubuntu-cpc/includes.chroot/etc/hostname (+1/-0) live-build/ubuntu-cpc/includes.chroot/etc/hosts (+9/-0) live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces (+15/-0) live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d/eth0.cfg (+3/-0) |
To merge this branch: | bzr merge lp://staging/~rcj/livecd-rootfs/trusty-proposed_ubuntu-cpc |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathieu Trudel-Lapierre | Approve | ||
Steve Langasek | Pending | ||
Review via email: mp+324682@code.staging.launchpad.net |
To post a comment you must log in.
This depends on https:/ /code.launchpad .net/~rcj/ ubuntu/ +source/ live-build/ +git/live- build/+ ref/feature/ support_ livecd- rootfs_ ubuntu- cpc commits. There's no tree for trusty live-build so I made use of the usd-import-team tree.