From 7c09badeec7f5d3e5e00c0aa9c482afc521bdd30 Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Mon, 2 Jul 2018 13:44:34 -0500 Subject: [PATCH 1/2] Update unminimize script text and install ubuntu-standard when unminimizing a minimal image (LP: #1778777) --- debian/changelog | 6 ++++++ live-build/auto/build | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4eb7b7fc..9920817d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.525.2) bionic; urgency=medium + + * Update unminimize script text and install ubuntu-standard (LP: #1778777) + + -- Francis Ginther Mon, 02 Jul 2018 13:27:15 -0500 + livecd-rootfs (2.525.1) bionic; urgency=medium * Symlink systemd-networkd-wait-online to /bin/true in the live installer diff --git a/live-build/auto/build b/live-build/auto/build index 01dcc182..515319d1 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -109,12 +109,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" ] @@ -155,7 +159,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 if dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-server 2> /dev/null | grep -q '^installed$' \ From 14b7d8f80130f2d0259f81ae78c83db5013dc8c7 Mon Sep 17 00:00:00 2001 From: Francis Ginther Date: Tue, 3 Jul 2018 12:45:26 -0500 Subject: [PATCH 2/2] Revise changelog text --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9920817d..1e97e3c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ livecd-rootfs (2.525.2) bionic; urgency=medium - * Update unminimize script text and install ubuntu-standard (LP: #1778777) + * Update unminimize script text and install ubuntu-standard when + unminimizing a minimal image (LP: #1778777) -- Francis Ginther Mon, 02 Jul 2018 13:27:15 -0500