Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-09 01:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport "minimized round 2" changes from trunk to Xenial (LP: #1731492)

Browse Source
This commit is contained in:
Christopher Glass 2017-11-10 18:41:57 +01:00
parent 5da7c23c81
commit 67dab61787
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -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 livecd-rootfs (2.408.23) UNRELEASED; urgency=medium
[ Gary Wang ] [ Gary Wang ]

4
live-build/auto/build
View File

@ -166,6 +166,10 @@ EOF
rm -f chroot/boot/initrd.img-* rm -f chroot/boot/initrd.img-*
fi 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 if [ -f config/oem-config-preinstalled ]; then
# This is cargo-culted almost verbatim (with some syntax changes for # This is cargo-culted almost verbatim (with some syntax changes for

1
live-build/auto/config
View File

@ -676,6 +676,7 @@ lb config noauto \
--initsystem none \ --initsystem none \
--bootloader "$BOOTLOADER" \ --bootloader "$BOOTLOADER" \
--initramfs-compression lzma \ --initramfs-compression lzma \
--cache false \
${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
$OPTS \ $OPTS \
"$@" "$@"

21
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
View File

@ -160,6 +160,27 @@ if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; the
rm "${rootd}/boot/initrd.img" rm "${rootd}/boot/initrd.img"
fi 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 #### END COMMON ARCH FUNCTIONS