Avoid purging packages for ubuntu-cpc

With the switch to the ubuntu-cloud-minimal seed, we
don't really need to purge anything now. On the contrary,
the purging of packages if not installed, fails with the
exit code of 100.
This commit is contained in:
Utkarsh Gupta 2023-08-03 14:16:32 +05:30
parent 3522847a77
commit ca84320688

View File

@ -369,21 +369,24 @@ EOF
# done in chroot hooks. # done in chroot hooks.
if [ -z "$PASSES" ]; then if [ -z "$PASSES" ]; then
if [ "${SUBPROJECT:-}" = minimized ]; then if [ "${SUBPROJECT:-}" = minimized ]; then
# force removal of initramfs-tools, which we assert is not # ubuntu-cpc has moved to using ubuntu-cloud-minimal seed
# required for any minimized images but is still pulled in by # for minimized images, so don't need these purges anymore.
# default if [ "$PROJECT" != ubuntu-cpc ]; then
# also remove landscape-common, which is heavyweight and # force removal of initramfs-tools, which we assert is not
# in the server seed only to provide /etc/motd content which # required for any minimized images but is still pulled in by
# would only be seen by humans # default
Chroot chroot "env DEBIAN_FRONTEND=noninteractive \ # also remove landscape-common, which is heavyweight and
apt-get -y purge initramfs-tools busybox-initramfs \ # in the server seed only to provide /etc/motd content which
landscape-common" # would only be seen by humans
# and if initramfs-tools was configured before our kernel, Chroot chroot "env DEBIAN_FRONTEND=noninteractive \
# /etc/kernel/postinst.d/initramfs-tools will have created apt-get -y purge initramfs-tools busybox-initramfs \
# an initramfs despite the generic dpkg-divert; so remove it landscape-common"
# here. # and if initramfs-tools was configured before our kernel,
rm -f chroot/boot/initrd.img-* # /etc/kernel/postinst.d/initramfs-tools will have created
# an initramfs despite the generic dpkg-divert; so remove it
# here.
rm -f chroot/boot/initrd.img-*
fi
# temporary workaround: don't remove linux-base which # temporary workaround: don't remove linux-base which
# may have no other reverse-depends currently # may have no other reverse-depends currently
Chroot chroot "env DEBIAN_FRONTEND=noninteractive \ Chroot chroot "env DEBIAN_FRONTEND=noninteractive \