From aadb032e68ac0531a05c4f0ac3c25551b10ce7d7 Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Mon, 2 Jul 2018 16:43:35 -0500 Subject: [PATCH 1/2] Update unminimize script text and install ubuntu-standard when unminimizing a minimal image (LP: #1778777) --- debian/changelog | 7 +++++++ live-build/auto/build | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e2949dae..98d1f500 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.408.36) xenial; urgency=medium + + * Update unminimize script text and install ubuntu-standard when + unminimizing a miinimal 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 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 From 21b2f1fa465e394ef8ea035660f2514c387693f2 Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Tue, 3 Jul 2018 12:44:53 -0500 Subject: [PATCH 2/2] Fixed changelog typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 98d1f500..e9a80436 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ livecd-rootfs (2.408.36) xenial; urgency=medium * Update unminimize script text and install ubuntu-standard when - unminimizing a miinimal image (LP: #1778777) + unminimizing a minimal image (LP: #1778777) -- Francis Ginther Mon, 02 Jul 2018 16:42:18 -0500