From 91641eeeecea561a3880685b1b2e32d5ed53566e Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Wed, 16 Aug 2023 12:05:00 -0600 Subject: [PATCH 1/2] cpc/hooks: fix hang when running adt locally While attempting to run autopkgtest locally, the test stops at the following command: ssh-keygen -t ed25519 -C ubuntu_vagrant_insecure_key -b 4096 -f /tmp/tmp.VuAfnsBv1G/vagrant_insecure_key This is found in live-build/ubuntu-cpc/hooks.d/base/vagrant.binary It appears to be waiting for a passphrase, as running that outside of adt gives a more helpful "Enter passphrase" prompt. Explicitly set the passphrase to empty with the `-N` argument. --- live-build/ubuntu-cpc/hooks.d/base/vagrant.binary | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary b/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary index efcd3d4b..19e8738b 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary +++ b/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) From fcde591061fc0c1e06466d9890601538d130cc35 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Wed, 16 Aug 2023 12:22:20 -0600 Subject: [PATCH 2/2] changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 764e97cb..518d7162 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (23.10.15) UNRELEASED; urgency=medium + + * cpc/vagrant: fix possible autopkgtest hang on ssh-keygen + + -- Dan Bungert Wed, 16 Aug 2023 12:08:57 -0600 + livecd-rootfs (23.10.14) mantic; urgency=medium * canary