mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-04-10 18:51:18 +00:00
Backport "minimized round 2" changes from trunk to Xenial (LP: #1731492)
This commit is contained in:
parent
5da7c23c81
commit
67dab61787
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
||||
livecd-rootfs (2.408.24) UNRELEASED; urgency=medium
|
||||
|
||||
* Backport "minimized round 2" changes from trunk to Xenial (LP: #1731492)
|
||||
|
||||
-- Christopher Glass (Ubuntu) <tribaal@ubuntu.com> Fri, 10 Nov 2017 18:39:52 +0100
|
||||
|
||||
livecd-rootfs (2.408.23) UNRELEASED; urgency=medium
|
||||
|
||||
[ Gary Wang ]
|
||||
|
@ -166,6 +166,10 @@ EOF
|
||||
rm -f chroot/boot/initrd.img-*
|
||||
fi
|
||||
|
||||
# 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 [ -f config/oem-config-preinstalled ]; then
|
||||
|
||||
# This is cargo-culted almost verbatim (with some syntax changes for
|
||||
|
@ -676,6 +676,7 @@ lb config noauto \
|
||||
--initsystem none \
|
||||
--bootloader "$BOOTLOADER" \
|
||||
--initramfs-compression lzma \
|
||||
--cache false \
|
||||
${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
|
||||
$OPTS \
|
||||
"$@"
|
||||
|
@ -160,6 +160,27 @@ if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; the
|
||||
rm "${rootd}/boot/initrd.img"
|
||||
fi
|
||||
|
||||
if [ "${SUBPROJECT:-}" = minimized ]; then
|
||||
# Remove various packages that we don't want in the minimized images.
|
||||
# Some of these are tools that don't make sense by default
|
||||
# non-interactively; some are libraries whose reverse-dependencies
|
||||
# will have already been removed; open-vm-tools, it's a bug that this
|
||||
# is in the common cloud seed because this should only be included
|
||||
# in VMWare guest images, and we know none of the minimized images
|
||||
# are targeted at VMWare.
|
||||
_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
|
||||
apt-mark auto '^lib.*' '^python*' vim-runtime 2>/dev/null
|
||||
# FIXME: iso-codes is a dep of software-properties and shouldn't be
|
||||
_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
|
||||
apt-get -y autoremove --purge iso-codes xauth pastebinit \
|
||||
plymouth open-vm-tools git shared-mime-info vim vim-common \
|
||||
console-setup ncurses-term tmux screen policykit-1 \
|
||||
xdg-user-dirs less run-one apport-symptoms \
|
||||
ubuntu-cloudimage-keyring file
|
||||
|
||||
_xchroot "${rootd}" apt clean
|
||||
fi
|
||||
|
||||
#### END COMMON ARCH FUNCTIONS
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user