Merge lp:~fginther/livecd-rootfs/bionic-proposed-unminimized-standard into lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed

Proposed by Francis Ginther
Status: Merged
Approved by: Ɓukasz Zemczak
Approved revision: 1673
Merged at revision: 1672
Proposed branch: lp:~fginther/livecd-rootfs/bionic-proposed-unminimized-standard
Merge into: lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed
Diff against target: 46 lines (+14/-3)
2 files modified
debian/changelog (+7/-0)
live-build/auto/build (+7/-3)
To merge this branch: bzr merge lp:~fginther/livecd-rootfs/bionic-proposed-unminimized-standard
Reviewer Review Type Date Requested Status
Philip Roche (community) Approve
Robert C Jennings (community) Approve
Ubuntu Core Development Team Pending
Review via email: mp+348902@code.launchpad.net

Commit message

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

Description of the change

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

This has been tested by building a set of xenial cloud images and verifying that the image boots under kvm and 'ubuntu-standard' is present after running unminimize. The image is available here:

https://people.canonical.com/~fginther/minimal/livecd.ubuntu-cpc.bionic-lp1778777.img

To post a comment you must log in.
Revision history for this message
Robert C Jennings (rcj) wrote :

+1

review: Approve
Revision history for this message
Philip Roche (philroche) :
review: Approve
1673. By Francis Ginther

Revise changelog text

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-05-28 02:24:54 +0000
3+++ debian/changelog 2018-07-03 17:45:44 +0000
4@@ -1,3 +1,10 @@
5+livecd-rootfs (2.525.2) bionic; urgency=medium
6+
7+ * Update unminimize script text and install ubuntu-standard when
8+ unminimizing a minimal image (LP: #1778777)
9+
10+ -- Francis Ginther <francis.ginther@canonical.com> Mon, 02 Jul 2018 13:27:15 -0500
11+
12 livecd-rootfs (2.525.1) bionic; urgency=medium
13
14 * Symlink systemd-networkd-wait-online to /bin/true in the live installer
15
16=== modified file 'live-build/auto/build'
17--- live-build/auto/build 2018-04-11 21:26:43 +0000
18+++ live-build/auto/build 2018-07-03 17:45:44 +0000
19@@ -109,12 +109,16 @@
20 echo "This system has been minimized by removing packages and content that are"
21 echo "not required on a system that users do not log into."
22 echo ""
23-echo "This script restores the content and packages that are found on a default"
24-echo "Ubuntu server system."
25+echo "This script restores content and packages that are found on a default"
26+echo "Ubuntu server system in order to make this system more suitable for"
27+echo "interactive use."
28 echo ""
29 echo "Reinstallation of packages may fail due to changes to the system"
30 echo "configuration, the presence of third-party packages, or for other"
31 echo "reasons."
32+echo ""
33+echo "This operation may take some time."
34+echo ""
35 read -p "Would you like to continue? [y/N]" REPLY
36 echo # (optional) move to a new line
37 if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ]
38@@ -155,7 +159,7 @@
39
40 if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then
41 echo "Installing ubuntu-minimal package to provide the familiar Ubuntu minimal system..."
42- DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal
43+ DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal ubuntu-standard
44 fi
45
46 if dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-server 2> /dev/null | grep -q '^installed$' \

Subscribers

People subscribed via source and target branches