livecd-rootfs

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

  1. cosmic
  2. Merge into trunk
Proposed by Philip Roche
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 1686
Merged at revision: 1685
Proposed branch: lp:~philroche/livecd-rootfs/cosmic
Merge into: lp:livecd-rootfs
Diff against target: 46 lines (+11/-3)
2 files modified
debian/changelog (+4/-0)
live-build/auto/build (+7/-3)
To merge this branch: bzr merge lp:~philroche/livecd-rootfs/cosmic
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+348954@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.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

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

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

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 updated
1686. By Philip Roche

Update changelog to add unminimize change to current UNRELEASED changelog entry

Revision history for this message
Philip Roche (philroche) wrote :

@sil2100 My bad. Now updated

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Excellent.

review: Approve

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