Merge branch 'main' into kvm-bindings-0.8.0-again

Author: roypat

tools/test-popular-containers/build_rootfs.sh

@@ -43,7 +43,9 @@ function make_rootfs {
     umount -l mnt
     rmdir mnt
 
-    systemd-nspawn --pipe -i $IMG /bin/sh <<EOF
+    # --timezone=off parameter is needed to prevent systemd-nspawn from
+    # bind-mounting /etc/timezone, which causes a file conflict in Ubuntu 24.04
+    systemd-nspawn --timezone=off --pipe -i $IMG /bin/sh <<EOF
 set -x
 . /etc/os-release
 passwd -d root
@@ -65,5 +67,6 @@ EOF
 
 make_rootfs alpine:latest
 make_rootfs ubuntu:22.04
-make_rootfs ubuntu:23.04
+make_rootfs ubuntu:23.10
+make_rootfs ubuntu:24.04
 # make_rootfs ubuntu:latest