Merge lp:~fginther/livecd-rootfs/xenial-proposed-fix-pollinate-install into lp:~ubuntu-core-dev/livecd-rootfs/xenial-proposed

Proposed by Francis Ginther
Status: Merged
Merged at revision: 1463
Proposed branch: lp:~fginther/livecd-rootfs/xenial-proposed-fix-pollinate-install
Merge into: lp:~ubuntu-core-dev/livecd-rootfs/xenial-proposed
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot (+1/-1)
To merge this branch: bzr merge lp:~fginther/livecd-rootfs/xenial-proposed-fix-pollinate-install
Reviewer Review Type Date Requested Status
Philip Roche (community) Approve
Steve Langasek Approve
Review via email: mp+348868@code.launchpad.net

Commit message

Fix install command for pollinate (add '-y') in minimal images

Description of the change

This fixes an image build issue seen when building minimal cloud images. Without the '-y', apt-get will prompt for user input which will break the build.

I've built this change into a package and used it to rebuild the 16.04 set of minimal cloud images:
https://launchpad.net/~cloudware/+livefs/ubuntu/xenial/cpc-development/+build/138244

The portion of the build log related to this code change is here: https://paste.ubuntu.com/p/ZStpHvCB6F/

This regression was a gaff on my part. I did the exact same build on the prior submission, but must have failed to check the correct build results.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve
Revision history for this message
Philip Roche (philroche) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2018-06-29 22:17:02 +0000
+++ debian/changelog 2018-07-02 21:24:31 +0000
@@ -1,3 +1,10 @@
1livecd-rootfs (2.408.35) xenial; urgency=medium
2
3 * Fix the install command for pollinate which is added back to minimal
4 images (LP: #1779406)
5
6 -- Francis Ginther <francis.ginther@canonical.com> Mon, 02 Jul 2018 14:44:34 -0500
7
1livecd-rootfs (2.408.34) xenial; urgency=medium8livecd-rootfs (2.408.34) xenial; urgency=medium
29
3 * Add back pollinate for minimal after it is removed due to a dependency10 * Add back pollinate for minimal after it is removed due to a dependency
411
=== modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
--- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2018-06-29 19:52:52 +0000
+++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot 2018-07-02 21:24:31 +0000
@@ -179,7 +179,7 @@
179 ubuntu-cloudimage-keyring file179 ubuntu-cloudimage-keyring file
180 # Add back pollinate, which gets removed due to a dependency on vim-common180 # Add back pollinate, which gets removed due to a dependency on vim-common
181 _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \181 _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
182 apt-get install --no-install-recommends pollinate182 apt-get -y install --no-install-recommends pollinate
183183
184 _xchroot "${rootd}" apt clean184 _xchroot "${rootd}" apt clean
185fi185fi

Subscribers

People subscribed via source and target branches