|
|
@ -158,8 +158,14 @@ rm -f /usr/bin/man
|
|
|
|
dpkg-divert --quiet --remove --rename /usr/bin/man
|
|
|
|
dpkg-divert --quiet --remove --rename /usr/bin/man
|
|
|
|
EOF
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$PROJECT" != "ubuntu-base" ]; then
|
|
|
|
if [ "$PROJECT" = "ubuntu-base" ]; then
|
|
|
|
# The ubuntu-base unminimizer should not install ubuntu-minimal, but others should.
|
|
|
|
# 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.
|
|
|
|
cat >> chroot/usr/local/sbin/unminimize <<'EOF'
|
|
|
|
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
|
|
|
|
if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then
|
|
|
|