From ccef323973101a6c18f34f8d00a68195fe216a0c Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Wed, 6 Jun 2018 07:12:01 +1200
Subject: [PATCH] go back to having docker unminimize not install any extra
 packages

update text of man diversion to mention need to install man-db package
---
 debian/changelog      |  4 ++--
 live-build/auto/build | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1ecaabd..b23f1957 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-livecd-rootfs (2.529~ppa2~manpages1) cosmic; urgency=medium
+livecd-rootfs (2.529~ppa4) cosmic; urgency=medium
 
   * Improvements to the ubuntu-base (i.e. Docker) build:
-    - Customize the unminimize script to not install so many packages.
+    - 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)
diff --git a/live-build/auto/build b/live-build/auto/build
index eb18d5fe..c9598d34 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -158,14 +158,9 @@ rm -f /usr/bin/man
 dpkg-divert --quiet --remove --rename /usr/bin/man
 EOF
 
-                if [ "$PROJECT" = "ubuntu-base" ]; then
+                if [ "$PROJECT" != "ubuntu-base" ]; then
                     	# ubuntu-minimal is too much for a docker container (it contains
-                    	# e.g. systemd) but we should restore at least a few common things.
-	                cat >> chroot/usr/local/sbin/unminimize <<'EOF'
-apt-get install -y less man-db iproute2 vim-tiny
-EOF
-                else
-                    	# Other unminimizers install more.
+                    	# 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
@@ -209,7 +204,7 @@ 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."
+echo "command. You will still need to ensure the 'man-db' package is installed."
 EOF
                 chmod +x chroot/usr/bin/man
 	fi