From 928a9e6c71afe1480bcbe4621f0896ff50192c72 Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Mon, 2 Jul 2018 14:46:42 -0500 Subject: [PATCH 1/2] Fix install command for pollinate (add '-y') in minimal images --- debian/changelog | 6 ++++++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eea633be..ba5c5a69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.408.35) xenial; urgency=medium + + * Fix install command for pollinate (add '-y') in minimal images + + -- Francis Ginther 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 diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index d5b71f4c..6de926ed 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -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 From b882fed343c21a51ad493c6a95b7666e86a1935a Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Mon, 2 Jul 2018 16:20:20 -0500 Subject: [PATCH 2/2] Add bug and wordsmith changelog --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ba5c5a69..e2949dae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ livecd-rootfs (2.408.35) xenial; urgency=medium - * Fix install command for pollinate (add '-y') in minimal images + * Fix the install command for pollinate which is added back to minimal + images (LP: #1779406) -- Francis Ginther Mon, 02 Jul 2018 14:44:34 -0500