[Merge] ~philroche/livecd-rootfs/+git/livecd-rootfs:bugfix/unminimize-no-lxd-installer-package-jammy into livecd-rootfs:ubuntu/jammy

[Philip Roche]

Diff comments:

> diff --git a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early
> index f70b59b..69fbbcc 100755
> --- a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early
> +++ b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early
> @@ -10,11 +10,22 @@ case ${PASS} in
>          ;;
>  esac
>  
> -# The unminimize script will try to install the lxd snap. We can't
> -# do that at this stage so just neuter the snap command (the snap
> +# 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).
> -dpkg-divert --add --divert /usr/bin/snap.REAL --rename /usr/bin/snap
> -ln -s /bin/true /usr/bin/snap
> -yes | /usr/local/sbin/unminimize
> -rm /usr/bin/snap
> -dpkg-divert --remove --rename /usr/bin/snap
> +if [[ -f "/usr/sbin/lxd" ]]; then

ack. will remove

> +    rm --verbose --force /usr/sbin/lxd

understood.

> +    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
> +else
> +    # if /usr/sbin/lxd doesn't exist when lxd-installer package isn't installed so we can mock the command

my bad. 

# 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

is the correct comment

> +    # 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 the mock
> +    # /usr/sbin/lxd will still be present so we need to remove it
> +    rm --verbose --force /usr/sbin/lxd

understood.

> +fi
> \ No newline at end of file


-- 
https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/458910
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/jammy.