[1/4] guestfs: make trixie generic image the default

Commit Message

Luis Chamberlain Oct. 11, 2024, 1:01 a.m. UTC

The cloud image lacks 9p fs support so can't be used for
kernel hacking on kdevops unless you don't want to use 9p fs..
So while at it codify all this by disabling bootlinux 9p support
if the user selects that image.

Signed-off-by: Luis Chamberlain <[e-mail]>
---
 kconfigs/Kconfig.guestfs | 14 ++++++++++++--
 workflows/linux/Kconfig  |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

Patch

diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs
index 742781abcddc..da2f5e3961d7 100644
--- a/kconfigs/Kconfig.guestfs
+++ b/kconfigs/Kconfig.guestfs
@@ -10,6 +10,9 @@  config GUESTFS_REQUIRES_UEFI
 	bool
 	output yaml
 
+config GUESTFS_LACKS_9P
+	bool
+
 config GUESTFS_CUSTOM_RAW_IMAGE_URL
 	depends on GUESTFS_HAS_CUSTOM_RAW_IMAGE
 	depends on GUESTFS_HAS_CUSTOM_RAW_IMAGE_URL
@@ -111,19 +114,26 @@  if GUESTFS_DEBIAN_TRIXIE
 
 choice
 	prompt "Debian trixie flavor"
-	default GUESTFS_DEBIAN_TRIXIE_GENERIC_CLOUD_AMD64
+	default GUESTFS_DEBIAN_TRIXIE_GENERIC_AMD64
 
 config GUESTFS_DEBIAN_TRIXIE_GENERIC_AMD64
 	bool "debian-13-generic-amd64-daily"
 	help
 	  Should run in any environment using cloud-init, for e.g. OpenStack,
-	  DigitalOcean and also on bare metal.
+	  DigitalOcean and also on bare metal. This is the image you should
+	  try to use and stick to for kernel testing.
 
 config GUESTFS_DEBIAN_TRIXIE_GENERIC_CLOUD_AMD64
 	bool "debian-13-genericcloud-amd64-daily"
 	help
 	  Similar to generic. Should run in any virtualised environment. Is
 	  smaller than generic by excluding drivers for physical hardware.
+	  Note that the 9p client filesystem module will not be available to
+	  you with this image and so you cannot leverage 9p for building
+	  Linux on the host. This image also requires a EFI boot loader
+	  and secure boot is enabled by default which means your custom
+	  kernels will need to be signed and this plumbing is not supported
+	  yet so you are on your own.
 
 config GUESTFS_DEBIAN_TRIXIE_NOCLOUD_AMD64
 	bool "debian-13-nocloud-amd64-daily"
diff --git a/workflows/linux/Kconfig b/workflows/linux/Kconfig
index 8b1dfd3b25c7..b51d8ee3fb3d 100644
--- a/workflows/linux/Kconfig
+++ b/workflows/linux/Kconfig
@@ -38,7 +38,7 @@  endif # HAVE_SUPPORTS_PURE_IOMAP
 
 config BOOTLINUX_9P
 	bool "Use 9p to build Linux"
-	depends on LIBVIRT
+	depends on LIBVIRT && !GUESTFS_LACKS_9P
 	default LIBVIRT
 	help
 	  This will let you choose use 9p to build Linux. What this does is