Merge lp:~mwhudson/livecd-rootfs/ubuntu-base-less-unminimization into lp:livecd-rootfs

[Michael Hudson-Doyle]

   * Improvements to the ubuntu-base (i.e. Docker) build:
     - Customize the unminimize script to not install so many packages.
     - Divert /usr/bin/man to a script that points to the unminimize script.

[lp:~mwhudson/livecd-rootfs/ubuntu-base-less-unminimization]

1679. By Michael Hudson-Doyle on 2018-06-05

Remove apt lists that are currently removed downstream anyway.
(LP: #1699913)

[Steve Langasek (vorlon)]

review: Needs Information

[lp:~mwhudson/livecd-rootfs/ubuntu-base-less-unminimization]

1680. By Michael Hudson-Doyle on 2018-06-05

go back to having docker unminimize not install any extra packages

update text of man diversion to mention need to install man-db package

[Michael Hudson-Doyle (mwhudson)]

On 6 June 2018 at 06:55, Steve Langasek <email address hidden>
wrote:

>
> What is the justification for this hard-coded whitelist of packages? I
> would argue that it's better to have 'unminimize' not install any
> additional packages at all on the grounds that the docker image is only
> defined in terms of the minimized package set (ubuntu-base) and has no
> corresponding un-minimized form.
>

Yes, updated (and changed the man diversion a little to match)

[lp:~mwhudson/livecd-rootfs/ubuntu-base-less-unminimization]

1681. By Michael Hudson-Doyle on 2018-06-05

rm -r the lists

[Steve Langasek (vorlon)]

one more minor tweak requested; otherwise +1

review: Needs Fixing

[lp:~mwhudson/livecd-rootfs/ubuntu-base-less-unminimization]

1682. By Michael Hudson-Doyle on 2018-06-05

man un-diverting man idempotent

[Michael Hudson-Doyle (mwhudson)]

My test build for this at https://launchpad.net/~mwhudson/+livefs/ubuntu/cosmic/ubuntu-base-test/+build/134941 appeared to work well.

[Steve Langasek (vorlon)]

LGTM.

review: Approve

[lp:~mwhudson/livecd-rootfs/ubuntu-base-less-unminimization]

1683. By Michael Hudson-Doyle on 2018-06-06

fix version number

=== modified file 'debian/changelog'
--- debian/changelog	2018-05-28 14:39:53 +0000
+++ debian/changelog	2018-06-06 17:48:05 +0000
@@ -1,3 +1,13 @@
+livecd-rootfs (2.529) cosmic; urgency=medium
+
+  * Improvements to the ubuntu-base (i.e. Docker) build:
+    - Customize the unminimize script to not install ubuntu-minimal.
+    - Divert /usr/bin/man to a script that points to the unminimize script.
+    - Remove apt lists that are currently removed downstream anyway. 
+      (LP: #1699913)
+
+ -- Michael Hudson-Doyle <[e-mail]>  Tue, 05 Jun 2018 14:19:17 +1200
+
 livecd-rootfs (2.528) cosmic; urgency=medium
 
   * Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that
 
=== modified file 'live-build/auto/build'
--- live-build/auto/build	2018-04-11 21:26:43 +0000
+++ live-build/auto/build	2018-06-06 17:48:05 +0000
@@ -115,7 +115,7 @@
 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."
-read -p "Would you like to continue? [y/N]" REPLY
+read -p "Would you like to continue? [y/N] " REPLY
 echo    # (optional) move to a new line
 if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ]
 then
@@ -153,6 +153,18 @@
     fi
 fi
 
+if  [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
+    # Remove diverted man binary
+    rm -f /usr/bin/man
+    dpkg-divert --quiet --remove --rename /usr/bin/man
+fi
+EOF
+
+                if [ "$PROJECT" != "ubuntu-base" ]; then
+                    	# ubuntu-minimal is too much for a docker container (it contains
+                    	# systemd and other things)
+	                cat >> chroot/usr/local/sbin/unminimize <<'EOF'
+
 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
@@ -163,10 +175,12 @@
     echo "Installing ubuntu-server recommends..."
     DEBIAN_FRONTEND=noninteractive apt-get install -y landscape-common
 fi
+EOF
+fi
+                cat >> chroot/usr/local/sbin/unminimize <<'EOF'
 
 # unminimization succeeded, there is no need to mention it in motd
 rm -f /etc/update-motd.d/60-unminimize
-
 EOF
                 chmod +x chroot/usr/local/sbin/unminimize
 
@@ -183,7 +197,19 @@
 EOF
 
 		chmod +x chroot/etc/update-motd.d/60-unminimize
-        fi
+		Chroot chroot "dpkg-divert --quiet --add \
+			--divert /usr/bin/man.REAL --rename \
+			/usr/bin/man"
+		cat > chroot/usr/bin/man << EOF
+#!/bin/sh
+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 "To restore this content, including manpages, you can run the 'unminimize'"
+echo "command. You will still need to ensure the 'man-db' package is installed."
+EOF
+                chmod +x chroot/usr/bin/man
+	fi
 	Chroot chroot "dpkg-divert --quiet --add \
 		--divert /usr/sbin/update-initramfs.REAL --rename \
 		/usr/sbin/update-initramfs"
@@ -232,6 +258,11 @@
 	# remove crufty files that shouldn't be left in an image
 	rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
 	Chroot chroot apt clean
+	if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then
+		# Save even more size by removing apt lists (that are currently removed
+		# downstream anyway)
+		rm -rf chroot/var/lib/apt/lists/*
+	fi
 
 	if [ -f config/oem-config-preinstalled ]; then