livecd-rootfs

Merge lp://staging/~ubuntu-on-ec2/livecd-rootfs/cpc into lp://staging/livecd-rootfs

cpc
Merge into trunk

Proposed by Dan Watkins on 2015-04-07

Status:	Rejected
Rejected by:	Steve Langasek on 2015-04-09
Proposed branch:	lp://staging/~ubuntu-on-ec2/livecd-rootfs/cpc
Merge into:	lp://staging/livecd-rootfs
Diff against target:	665 lines (+538/-4) (has conflicts) 14 files modified live-build/auto/build (+12/-0) live-build/auto/config (+42/-4) live-build/ubuntu-core/hooks/99zz-check-uid-gid.chroot (+52/-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/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 (+281/-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) Conflict adding file live-build/ubuntu-core/hooks/99zz-check-uid-gid.chroot. Moved existing file to live-build/ubuntu-core/hooks/99zz-check-uid-gid.chroot.moved.
To merge this branch:	bzr merge lp://staging/~ubuntu-on-ec2/livecd-rootfs/cpc
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Steve Langasek		Needs Fixing on 2015-04-07
Michael Vogt	2015-04-07	Pending
Review via email: mp+255346@code.staging.launchpad.net

Description of the change

This merge proposal contains the changes required to use livecd-rootfs to build our base cloud images. We are currently using it in a PPA for building the vivid cloud images using the Launchpad buildds.

(Resubmitting because LP seems to have got unhappy about diffs/conflicts)

Revision history for this message

Steve Langasek (vorlon) wrote on 2015-04-07:

This MP still shows a conflict over the live-build/ubuntu-core/hooks/99zz-check-uid-gid.chroot file, and wants to move the existing file aside and replace it. Could you please resolve this conflict (probably requires a fresh branch and a new MP)?

review: Needs Fixing

Revision history for this message

Dan Watkins (oddbloke) wrote on 2015-04-08:

On 07/04/15 20:58, Steve Langasek wrote:
> This MP still shows a conflict over the live-build/ubuntu-core/hooks/99zz-check-uid-gid.chroot file, and wants to move the existing file aside and replace it. Could you please resolve this conflict (probably requires a fresh branch and a new MP)?

Blurgh, sorry. Have opened a new MP for a new branch at
https://code.launchpad.net/~ubuntu-on-ec2/livecd-rootfs/cpc2/+merge/255468.

Unmerged revisions

1106. By Dan Watkins on 2015-03-31: Don't try to install acpiphp any more (LP: #1430323).
1105. By Dan Watkins on 2015-03-31: Set ext image options.
1104. By Dan Watkins on 2015-03-31: Get the right package sets for arm* and ppc64el.
1103. By Dan Watkins on 2015-03-31: Install the correct kernels on each arch.
1102. By Dan Watkins on 2015-03-31: Put our fstab in place.
1101. By Dan Watkins on 2015-03-31: Set the root_fs_label correctly.
1100. By Dan Watkins on 2015-03-31: Ensure we ship results of apt-get update.
1099. By Dan Watkins on 2015-03-31: Put correct apt sources in place.
1098. By Dan Watkins on 2015-03-31: Add hooks and includes.
1097. By Dan Watkins on 2015-03-31: Add our own hook.