[Merge] ~jchittum/livecd-rootfs:jammy-vagrant-more-secure-private-key into livecd-rootfs:ubuntu/master

[Utkarsh Gupta]

Review: Approve

Thank you, all looks good.

Sponsored the upload:
$ dput ubuntu ../livecd-rootfs_2.765_source.changes                                        
Checking signature on .changes
gpg: ../livecd-rootfs_2.765_source.changes: Valid signature from 823E967606C34B96
Checking signature on .dsc
gpg: ../livecd-rootfs_2.765.dsc: Valid signature from 823E967606C34B96
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading livecd-rootfs_2.765.dsc: done.
  Uploading livecd-rootfs_2.765.tar.xz: done.    
  Uploading livecd-rootfs_2.765_source.buildinfo: done.
  Uploading livecd-rootfs_2.765_source.changes: done.
Successfully uploaded packages.


Diff comments:

> diff --git a/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary b/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary
> index 4974692..efcd3d4 100755
> --- a/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary
> +++ b/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary
> @@ -145,6 +156,8 @@ load include_vagrantfile if File.exist?(include_vagrantfile)
>  
>  Vagrant.configure("2") do |config|
>    config.vm.base_mac = "${macaddr}"
> +  # Set to use our vagrant_insecure_key. Path is relative to Vagrantfile
> +  config.ssh.private_key_path = File.join(File.expand_path(File.dirname(__FILE__)), "vagrant_insecure_key")

damn, this is Ruby. I know Ruby. Fun!

>  
>    config.vm.provider "virtualbox" do |vb|
>       vb.customize [ "modifyvm", :id, "--uart1", "0x3F8", "4" ]


-- 
https://code.launchpad.net/~jchittum/livecd-rootfs/+git/livecd-rootfs/+merge/420024
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.