mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 03:11:12 +00:00
still install a few packages in docker unminimize
This commit is contained in:
parent
514faae2db
commit
fa1bce5389
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
livecd-rootfs (2.529~ppa1manpages1) cosmic; urgency=medium
|
||||
|
||||
* Test build.
|
||||
|
||||
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> 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
|
||||
|
@ -158,8 +158,14 @@ rm -f /usr/bin/man
|
||||
dpkg-divert --quiet --remove --rename /usr/bin/man
|
||||
EOF
|
||||
|
||||
if [ "$PROJECT" != "ubuntu-base" ]; then
|
||||
# The ubuntu-base unminimizer should not install ubuntu-minimal, but others should.
|
||||
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.
|
||||
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
|
||||
@ -203,7 +209,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."
|
||||
EOF
|
||||
chmod +x chroot/usr/bin/man
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user