From 62a80ac00a30654cf627a21fac6ac275e72b8343 Mon Sep 17 00:00:00 2001 From: Philip Roche Date: Wed, 19 Jun 2024 15:20:09 +0100 Subject: [PATCH] fix: Revert removal of unminimize call in server builds (LP: #2069828) There was a change made by me in https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/466388 as part of LP: #2066905 to remove references to LXD in the unminimize scripts but I also removed the calls to `unminimize` in error. This still needs to run but without any references to LXD which no longer needs to be `unminimized` via snap installation. (cherry picked from commit f574fc8200d8a4c7837288c5d2aa1e515137bb55) --- debian/changelog | 6 ++++++ live-build/ubuntu-server/hooks/01-unminimize.chroot_early | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8cf7a408..bdbe1170 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.04.73) UNRELEASED; urgency=medium + + * Revert removal of unminimize call in server builds (LP: #2069828) + + -- Philip Roche Mon, 24 Jun 2024 14:24:52 +0100 + livecd-rootfs (24.04.72) UNRELEASED; urgency=medium * riscv64: use earlycon=sbi on command line (LP: #2068739) diff --git a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early index 6ed92bb7..be786ab8 100755 --- a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early +++ b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early @@ -10,6 +10,10 @@ case ${PASS} in ;; esac +# Run the unminimize script to re-install packages with all dpkg filters removed and install packages +# removed as part of minimization +yes | /usr/local/sbin/unminimize + # Fix up missing recommends. Other non-layered flavors handle this in # live-build/auto/build, but we need to do it here. Also, there are # additional recommends missing from server-minimal that wouldn't be