Merge lp:~fginther/livecd-rootfs/xenial-proposed-fix-pollinate-install

This commit is contained in:
Steve Langasek 2018-07-02 15:39:50 -07:00
commit badc9aa7d1
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.408.35) xenial; urgency=medium
* Fix the install command for pollinate which is added back to minimal
images (LP: #1779406)
-- Francis Ginther <francis.ginther@canonical.com> Mon, 02 Jul 2018 14:44:34 -0500
livecd-rootfs (2.408.34) xenial; urgency=medium
* Add back pollinate for minimal after it is removed due to a dependency

View File

@ -179,7 +179,7 @@ if [ "${SUBPROJECT:-}" = minimized ]; then
ubuntu-cloudimage-keyring file
# Add back pollinate, which gets removed due to a dependency on vim-common
_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends pollinate
apt-get -y install --no-install-recommends pollinate
_xchroot "${rootd}" apt clean
fi