Merge lp:~philroche/livecd-rootfs/cosmic into lp:livecd-rootfs

[Philip Roche]

Update unminimize script text and install ubuntu-standard when unminimizing a minimal image (LP: #1778777)

The unminimize script now installs ubuntu-standard and has more appropriate wording.

[Łukasz Zemczak (sil2100)]

Looks the same as what we have for xenial and bionic, so +1 from me.

review: Approve

[Łukasz Zemczak (sil2100)]

Actually, wait, this does need some work actually - approved too fast! The previous version (2.533) is still UNRELEASED, meaning we cannot put anything on top of it. Could you remove the new changelog entry and put its contents into the 2.533 version? And please leave it UNRELEASED. Thank you!

review: Needs Fixing

[lp:~philroche/livecd-rootfs/cosmic]

1686. By Philip Roche on 2018-07-04

Update changelog to add unminimize change to current UNRELEASED changelog entry

[Philip Roche (philroche)]

@sil2100 My bad. Now updated

[Łukasz Zemczak (sil2100)]

Excellent.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-06-14 11:41:46 +0000
+++ debian/changelog	2018-07-04 16:13:23 +0000
@@ -7,6 +7,10 @@
   * live-build/auto/config: Drop "lp-*" hostname filter for Launchpad
     builders, since LP #1747015 is now fixed; "*.buildd" should be enough.
 
+  [ Francis Ginther ]
+  * Update unminimize script text and install ubuntu-standard when
+    unminimizing a minimal image (LP: #1778777)
+
  -- Robert C Jennings <[e-mail]>  Fri, 08 Jun 2018 10:10:53 -0700
 
 livecd-rootfs (2.532) cosmic; urgency=medium
 
=== modified file 'live-build/auto/build'
--- live-build/auto/build	2018-06-05 22:51:35 +0000
+++ live-build/auto/build	2018-07-04 16:13:23 +0000
@@ -109,12 +109,16 @@
 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" ]
@@ -167,7 +171,7 @@
 
 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$' \