From c828990503ce0d688b8ff99db77143ad95e5994b Mon Sep 17 00:00:00 2001
From: Michael Prokop <mprokop@sipwise.com>
Date: Thu, 24 Apr 2025 15:47:06 +0200
Subject: [PATCH] MT#62436 Use virtualbox-guest-additions ISO from upstream on
 Debian/trixie

virtualbox-guest-additions-iso v7.0.20-1 as present in current Debian/trixie
doesn't yet support kernel v6.12.22-1 (being the current kernel version
in Debian/trixie), while upstream supports kernel 6.12 as of VirtualBox 7.1.4.
Reported towards Debian as https://bugs.debian.org/1104024

FTR:

| mprokop@jenkins1 ~ % cd /var/www/files
| mprokop@jenkins1 ~www/files % wget https://download.virtualbox.org/virtualbox/7.1.8/VBoxGuestAdditions_7.1.8.iso
| [...]
| mprokop@jenkins1 ~www/files % curl -s https://download.virtualbox.org/virtualbox/7.1.8/SHA256SUMS | sha256sum -c --ignore-missing
| VBoxGuestAdditions_7.1.8.iso: OK

Change-Id: I32aa7806e375c4b85084a99d5a6903f632807694
---
 templates/scripts/includes/deployment.sh | 28 +++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh
index 49ac03a..fb0ef4e 100755
--- a/templates/scripts/includes/deployment.sh
+++ b/templates/scripts/includes/deployment.sh
@@ -1066,6 +1066,24 @@ EOF
   fi
 }
 
+install_vbox_guest_additions_iso() {
+  echo "Downloading virtualbox-guest-additions ISO"
+
+  local virtualbox_dir="/usr/share/virtualbox"
+  local virtualbox_iso="VBoxGuestAdditions_7.1.8.iso"
+  local virtualbox_iso_checksum="0001ed19cc389f04723c9b911338559b9b74bea0d24edf794d8d2ce5b5cb14e0" # sha256
+  local virtualbox_iso_url_path="/files/${virtualbox_iso}"
+
+  mkdir -p "${virtualbox_dir}"
+  # hardcode filename here, so we can re-use it within vagrant_configuration()
+  vbox_isofile="${virtualbox_dir}/VBoxGuestAdditions.iso"
+  wget --retry-connrefused --no-verbose -c -O "${vbox_isofile}" "${SIPWISE_URL}${virtualbox_iso_url_path}"
+
+  if ! echo "${virtualbox_iso_checksum} ${vbox_isofile}" | sha256sum --check ; then
+    die "Error: failed to compute checksum for ${virtualbox_iso}. Exiting."
+  fi
+}
+
 vagrant_configuration() {
   # bzip2, linux-headers-amd64 and make are required for VirtualBox Guest Additions installer
   # less + sudo are required for Vagrant itself
@@ -1080,7 +1098,15 @@ vagrant_configuration() {
     die "Error: failed to wget public Sipwise SSH key for Vagrant boxes"
   fi
 
-  ensure_packages_installed 'virtualbox-guest-additions-iso'
+  case "${DEBIAN_RELEASE}" in
+    trixie)
+      # we need a newer virtualbox-guest-additions-iso version than present in Debian/trixie
+      install_vbox_guest_additions_iso
+      ;;
+    *)
+      ensure_packages_installed 'virtualbox-guest-additions-iso'
+      ;;
+  esac
 
   if "$NGCP_INSTALLER" ; then
     local SIPWISE_HOME="/nonexistent"