From 46c19dfa913c133042d62e0caa2d2d526cd9bb7f Mon Sep 17 00:00:00 2001 From: Philip Roche Date: Thu, 23 May 2024 14:10:50 +0100 Subject: [PATCH] fix: No longer install LXD snap in unminimize script (LP: #2066905) The LXD snap is no longer seeded in any images since Noble+ so the LXD related unminimize logic in ./live-build/auto/build?h=ubuntu/noble and ./live-build/ubuntu-server/hooks/01-unminimize.chroot_early is no longer required. lxd-installer can remain installed. --- debian/changelog | 6 ++++- live-build/auto/build | 12 --------- .../hooks/01-unminimize.chroot_early | 25 ------------------- 3 files changed, 5 insertions(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index 65ca53e0..5b3afce6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ livecd-rootfs (24.10.2) UNRELEASED; urgency=medium + [ Michael Hudson-Doyle ] * Replace 'ubuntustudio-dvd' project with an almost identical 'ubuntustudio' project. - -- Michael Hudson-Doyle Thu, 09 May 2024 08:54:33 +0200 + [ Philip Roche ] + * No longer install LXD snap in unminimize script (LP: #2066905) + + -- Philip Roche Thu, 23 May 2024 14:11:57 +0100 livecd-rootfs (24.10.1) oracular; urgency=medium diff --git a/live-build/auto/build b/live-build/auto/build index b967f4e0..93184e7a 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -284,18 +284,6 @@ fi EOF fi - if [ "$PROJECT" = "ubuntu-cpc" ] || [ "$PROJECT" = "ubuntu-server" ]; then - cat >> chroot/usr/local/sbin/unminimize <<'EOF' - -# installing LXD using the lxd-installer by simply invoking it -echo "Invoking LXD so that it can be installed by the lxd-installer's script.." -lxd --version - -echo "Removing lxd installer package..." -apt-get purge -y lxd-installer - -EOF - fi cat >> chroot/usr/local/sbin/unminimize <<'EOF' # unminimization succeeded, there is no need to mention it in motd diff --git a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early index 0d7ab5a4..6ed92bb7 100755 --- a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early +++ b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early @@ -10,31 +10,6 @@ case ${PASS} in ;; esac -# The unminimize script will try to install the lxd snap using the shim script -# /usr/sbin/lxd from the lxd-installer package. -# We can't do that at this stage so just neuter the lxd command (the snap -# will get properly seeded by generic machinery). -if [ -f "/usr/sbin/lxd" ]; then - dpkg-divert --add --divert /usr/sbin/lxd.REAL --rename /usr/sbin/lxd - ln -s /bin/true /usr/sbin/lxd - yes | /usr/local/sbin/unminimize - # unminimize also uninstalls lxd-installer package - # and also removed `/usr/sbin/lxd` as a result, so we don't need to restore, but - # we do need to remove the mock we used as part of dpkg-divert - # first we need to remove the diversion - dpkg-divert --remove --no-rename /usr/sbin/lxd - # now remove the renamed file that we originally diverted to - rm -v /usr/sbin/lxd.REAL -else - # if /usr/sbin/lxd doesn't exist then lxd-installer package isn't installed. - # Instead, we can mock the command to avoid the unminimize script failing - ln -s /bin/true /usr/sbin/lxd - yes | /usr/local/sbin/unminimize - # as the lxd-installer package was not installed and thus not removed by `unminimize` - # the mock /usr/sbin/lxd will still be present, so we need to remove it - rm -v /usr/sbin/lxd -fi - # 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