diff --git a/debian/changelog b/debian/changelog index eea633be..e9a80436 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +livecd-rootfs (2.408.36) xenial; urgency=medium + + * Update unminimize script text and install ubuntu-standard when + unminimizing a minimal image (LP: #1778777) + + -- Francis Ginther Mon, 02 Jul 2018 16:42:18 -0500 + +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 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/auto/build b/live-build/auto/build index fb1c3947..69d8d94d 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -79,12 +79,16 @@ set -e echo "This system has been minimized by removing packages and content that are" echo "not required on a system that users do not log into." echo "" -echo "This script restores the content and packages that are found on a default" -echo "Ubuntu server system." +echo "This script restores content and packages that are found on a default" +echo "Ubuntu server system in order to make this system more suitable for" +echo "interactive use." echo "" echo "Reinstallation of packages may fail due to changes to the system" echo "configuration, the presence of third-party packages, or for other" echo "reasons." +echo "" +echo "This operation may take some time." +echo "" read -p "Would you like to continue? [y/N]" REPLY echo # (optional) move to a new line if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ] @@ -125,7 +129,7 @@ fi if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then echo "Installing ubuntu-minimal package to provide the familiar Ubuntu minimal system..." - DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal + DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal ubuntu-standard fi # unminimization succeeded, there is no need to mention it in motd 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