Merge ~xnox/casper:x13s into casper:main

[Dimitri John Ledkov]

canary_tweaks: Encode kernel metapackage & flavour again

Ensure x13s booted installer installs laptop-23.10 kernel flavour.

[Dimitri John Ledkov (xnox)]

ah, forgot to restart the subiquity daemon.

[Dimitri John Ledkov (xnox)]

this got past the stage of installing kernel.

[Steve Langasek (vorlon)]

The subiquity implementation is:

        # the ISO may have been configured to tell us what kernel to use
        # /run is the historical location, but a bit harder to craft an ISO to
        # have it there as it needs to be populated at runtime.
        run_mp_file = os.path.join(self.app.base_model.root, "run/kernel-meta-package")
        etc_mp_file = os.path.join(
            self.app.base_model.root, "etc/subiquity/kernel-meta-package"
        )
        for mp_file in (run_mp_file, etc_mp_file):
            if os.path.exists(mp_file):
                with open(mp_file) as fp:
                    kernel_package = fp.read().strip()
                self.model.metapkg_name = kernel_package
                self.model.explicitly_requested = True
                log.debug(f"Using kernel {kernel_package} due to {mp_file}")
                break

This means that instead of casper having to guess the metapackage name at boot time based on uname, it is POSSIBLE for us to encode this in the squashfs at image construction time. And then all the logic about the metapackages is kept local to the image build system and we can populate it based on $KERNEL_FLAVOURS directly.

It means we need to add support for this in livecd-rootfs AND drop this bit from casper, because /run takes precedence over /etc. But once done, we should be free of this long-term.

review: Needs Fixing

Unmerged commits

4621e11... by Dimitri John Ledkov on 2023-10-01

canary_tweaks: Encode kernel metapackage & flavour again

Ensure x13s booted installer installs laptop-23.10 kernel flavour.

LP: #2037798

Signed-off-by: Dimitri John Ledkov <email address hidden>

diff --git a/scripts/casper-bottom/61desktop_canary_tweaks b/scripts/casper-bottom/61desktop_canary_tweaks
index b37028f..acd70da 100755
--- a/scripts/casper-bottom/61desktop_canary_tweaks
+++ b/scripts/casper-bottom/61desktop_canary_tweaks
@@ -33,7 +33,18 @@ printf "[org.gnome.shell]\ndisabled-extensions=['[e-mail]']\n" >> /ro
 chroot /root glib-compile-schemas /usr/share/glib-2.0/schemas/
 
 # set the right kernel variant
-echo "linux-generic-hwe-22.04" > /run/kernel-meta-package
+case `uname -r` in
+    *-laptop)
+	meta=linux-laptop-23.10
+	;;
+    *-generic)
+	meta=linux-generic-hwe-22.04
+	;;
+    *)
+	meta=linux-generic-hwe-22.04
+	;;
+esac
+echo "$meta" > /run/kernel-meta-package
 
 # start the installer on session start, restore normal session on close
 cat > /root/usr/lib/systemd/user/ubuntu-desktop-installer.service  << EOF