From caeafa836b5960ee431b6ec7858d7a128e0bf3b6 Mon Sep 17 00:00:00 2001
From: Mikhail Chusavitin <mchusavitin@mchusmbp.local>
Date: Sat, 14 Mar 2026 07:51:16 +0300
Subject: [PATCH] Improve VM boot diagnostics and guest support

---
 iso/builder/auto/config                                    | 2 +-
 iso/builder/config/bootloaders/grub-pc/config.cfg          | 6 +++++-
 iso/builder/config/hooks/normal/9000-bee-setup.hook.chroot | 2 ++
 iso/builder/config/package-lists/bee.list.chroot           | 1 +
 iso/overlay/etc/initramfs-tools/modules                    | 5 +++++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 iso/overlay/etc/initramfs-tools/modules

diff --git a/iso/builder/auto/config b/iso/builder/auto/config
index d7cb5e6..9221e53 100755
--- a/iso/builder/auto/config
+++ b/iso/builder/auto/config
@@ -23,6 +23,6 @@ lb config noauto \
     --memtest none \
     --iso-volume "BEE-DEBUG" \
     --iso-application "Bee Hardware Audit" \
-    --bootappend-live "boot=live components nomodeset modprobe.blacklist=nouveau" \
+    --bootappend-live "boot=live components console=tty0 console=ttyS0,115200n8 modprobe.blacklist=nouveau" \
     --apt-recommends false \
     "${@}"
diff --git a/iso/builder/config/bootloaders/grub-pc/config.cfg b/iso/builder/config/bootloaders/grub-pc/config.cfg
index 3a69075..35aa67a 100644
--- a/iso/builder/config/bootloaders/grub-pc/config.cfg
+++ b/iso/builder/config/bootloaders/grub-pc/config.cfg
@@ -19,9 +19,13 @@ else
     insmod all_video
 fi
 
+insmod serial
+serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
+
 insmod gfxterm
 insmod png
 
 source /boot/grub/theme.cfg
 
-terminal_output gfxterm
+terminal_input console serial
+terminal_output gfxterm serial
diff --git a/iso/builder/config/hooks/normal/9000-bee-setup.hook.chroot b/iso/builder/config/hooks/normal/9000-bee-setup.hook.chroot
index 750bfac..f068c1f 100755
--- a/iso/builder/config/hooks/normal/9000-bee-setup.hook.chroot
+++ b/iso/builder/config/hooks/normal/9000-bee-setup.hook.chroot
@@ -11,6 +11,8 @@ systemctl enable bee-nvidia.service
 systemctl enable bee-audit.service
 systemctl enable bee-sshsetup.service
 systemctl enable ssh.service
+systemctl enable qemu-guest-agent.service 2>/dev/null || true
+systemctl enable serial-getty@ttyS0.service 2>/dev/null || true
 
 # Ensure scripts are executable
 chmod +x /usr/local/bin/bee-network.sh  2>/dev/null || true
diff --git a/iso/builder/config/package-lists/bee.list.chroot b/iso/builder/config/package-lists/bee.list.chroot
index c97695c..9ce93a6 100644
--- a/iso/builder/config/package-lists/bee.list.chroot
+++ b/iso/builder/config/package-lists/bee.list.chroot
@@ -11,6 +11,7 @@ lshw
 iproute2
 isc-dhcp-client
 iputils-ping
+qemu-guest-agent
 
 # SSH
 openssh-server
diff --git a/iso/overlay/etc/initramfs-tools/modules b/iso/overlay/etc/initramfs-tools/modules
new file mode 100644
index 0000000..5d801d6
--- /dev/null
+++ b/iso/overlay/etc/initramfs-tools/modules
@@ -0,0 +1,5 @@
+# Virtual GPU drivers for KVM/VMware guests
+virtio_gpu
+bochs_drm
+qxl
+vmwgfx