Merge remote-tracking branch 'dbungert/adt-hang-vagrant' into ubuntu/master

debian/changelog

@@ -6,6 +6,9 @@ livecd-rootfs (24.04.7) UNRELEASED; urgency=medium
   [ Jean-Baptiste Lallement ]
   * Include -updates when calling germinate.  LP: #1921862.
 
+  [ Dan Bungert ]
+  * cpc/vagrant: fix possible autopkgtest hang on ssh-keygen
+
  -- Dave Jones <dave.jones@canonical.com>  Mon, 02 Oct 2023 15:46:06 +0100
 
 livecd-rootfs (24.04.6) noble; urgency=medium

live-build/ubuntu-cpc/hooks.d/base/vagrant.binary

@@ -66,7 +66,8 @@ trap cleanup_vagrant EXIT
 ### https://github.com/hashicorp/vagrant/tree/main/keys
 ##########################
 
-ssh-keygen -t ed25519 -C "ubuntu_vagrant_insecure_key" -b 4096 -f ${box_d}/vagrant_insecure_key
+ssh-keygen -t ed25519 -C "ubuntu_vagrant_insecure_key" -b 4096 \
+	-f ${box_d}/vagrant_insecure_key -N ""
 
 pub_key=$(cat ${box_d}/vagrant_insecure_key.pub)