From 97c8996c2978a89d0edd02437d3fd02337a7d18d Mon Sep 17 00:00:00 2001
From: Christopher Glass <christopher.glass@canonical.com>
Date: Fri, 25 Aug 2017 16:57:36 +0200
Subject: [PATCH] Remove the useless user and password from default config.

---
 live-build/ubuntu-cpc/hooks/042-vagrant.binary | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
index 518c7d43..87cdd4a2 100755
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
@@ -121,7 +121,7 @@ cdrom_vmdk_f="${box_d}/${prefix}-configdrive.vmdk"
 # except via local host.
 cat > ${seed_d}/user-data <<END
 #cloud-config
-chpasswd: { expire: True }
+chpasswd: { expire: False }
 password: ${ubuntu_user_pass}
 ssh_pwauth: True
 manage_etc_hosts: localhost
@@ -165,8 +165,6 @@ load include_vagrantfile if File.exist?(include_vagrantfile)
 ## We also have an "ubuntu" user with pass "${ubuntu_user_pass}"
 Vagrant.configure("2") do |config|
   config.vm.base_mac = "${macaddr}"
-  config.ssh.username = "vagrant"
-  config.ssh.password = "vagrant"
 
   config.vm.provider "virtualbox" do |vb|
      vb.customize [ "modifyvm", :id, "--uart1", "0x3F8", "4" ]