images/base: upgrade to ubuntu 22.04

images/base.pkr.hcl

@@ -31,8 +31,8 @@ source "qemu" "autogenerated_1" {
   disk_compression = "${var.compressed}"
   headless         = true
   http_directory   = "scripts"
-  iso_checksum     = "file:https://cloud-images.ubuntu.com/minimal/releases/bionic/release/SHA256SUMS"
-  iso_url          = "https://cloud-images.ubuntu.com/minimal/releases/bionic/release/ubuntu-18.04-minimal-cloudimg-amd64.img"
+  iso_checksum     = "file:https://cloud-images.ubuntu.com/minimal/releases/jammy/release/SHA256SUMS"
+  iso_url          = "https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img"
   memory           = "${var.memory}"
   net_device       = "virtio-net"
   output_directory = "output-${var.outname}"

images/scripts/install-base.sh

@@ -2,22 +2,36 @@
 
 set -eux
 
-pushd /tmp/input
-mv guestinit.sh /home/ubuntu/guestinit.sh
-mv bzImage /boot/vmlinuz-5.15.93
-mv config-5.15.93 /boot/
-mv m5 /sbin/m5
-update-grub
-tar xf kheaders.tar.bz2 -C /
-popd
-rm -rf /tmp/input
-
 apt-get update
 apt-get -y install \
     iperf \
     iputils-ping \
+    lbzip2 \
     netperf \
     netcat \
     ethtool \
     tcpdump \
-    pciutils
+    pciutils \
+    busybox \
+    numactl \
+    sysbench
+
+pushd /tmp/input
+mv guestinit.sh /home/ubuntu/guestinit.sh
+mv bzImage /boot/vmlinuz-5.15.93
+mv config-5.15.93 /boot/
+mv m5 /sbin/m5
+update-grub
+
+# with stupid ubuntu22 /lib is a symlink at which point just untaring to / will
+# replace that symlink with a directory, so first extract and then carefully
+# copy... -.-
+mkdir kheaders
+cd kheaders
+tar xf /tmp/input/kheaders.tar.bz2
+cp -a lib/modules/* /lib/modules/
+cp -a usr/* /usr/
+
+# cleanup
+popd
+rm -rf /tmp/input