From 239453d644ea2430936f60ec5e4df5e0694d034c Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 4 Aug 2022 11:24:53 -0700 Subject: [PATCH] Remove modemmanager and udisks2 from cloud images in addition to fwupd. The use of tasks at install means all packages are marked manually installed in the apt database, so removing fwupd does not remove its dependencies. LP: #1981109. --- debian/changelog | 9 +++++++++ .../ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b2ff3a43..264ca08f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.774) UNRELEASED; urgency=medium + + * Remove modemmanager and udisks2 from cloud images in addition to fwupd. + The use of tasks at install means all packages are marked manually + installed in the apt database, so removing fwupd does not remove its + dependencies. LP: #1981109. + + -- Steve Langasek Thu, 04 Aug 2022 11:20:51 -0700 + livecd-rootfs (2.773) kinetic; urgency=medium * When adding the new RISC-V platforms, some of the generic non-SUBARCH code diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot index d77ae6bb..3d780e6e 100755 --- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot @@ -93,8 +93,13 @@ fi # Recommends of ubuntu-server that should not be included in cloud images by # default +# unfortunately because we are currently installing ubuntu-server as a task, +# all of the recursive dependencies are marked as manually installed and are +# not subject to autoremoval. There is discussion of us stopping the use of +# tasks in livecd-rootfs but in the meantime, we have to also explicitly +# remove the packages providing the services _xchroot "$rootd" env DEBIAN_FRONTEND=noninteractive \ - apt-get -y autoremove --purge fwupd + apt-get -y autoremove --purge fwupd modemmanager udisks2 if [ "${SUBPROJECT:-}" = minimized ]; then # Remove various packages that we don't want in the minimized images.