Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-09 09:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Steve Langasek 2023-12-03 21:20:22 -08:00
commit 4fb141bbec
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -6,6 +6,9 @@ livecd-rootfs (24.04.7) UNRELEASED; urgency=medium
[ Jean-Baptiste Lallement ] [ Jean-Baptiste Lallement ]
* Include -updates when calling germinate. LP: #1921862. * 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 -- Dave Jones <dave.jones@canonical.com> Mon, 02 Oct 2023 15:46:06 +0100
livecd-rootfs (24.04.6) noble; urgency=medium livecd-rootfs (24.04.6) noble; urgency=medium

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

@ -66,7 +66,8 @@ trap cleanup_vagrant EXIT
### https://github.com/hashicorp/vagrant/tree/main/keys ### 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) pub_key=$(cat ${box_d}/vagrant_insecure_key.pub)