From 87f34122fb543c9c6fd746fee5c2c605402a8579 Mon Sep 17 00:00:00 2001
From: Christopher Glass <christopher.glass@canonical.com>
Date: Fri, 25 Aug 2017 17:02:52 +0200
Subject: [PATCH] Remove useless diff.

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

diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
index 87cdd4a2..43f69734 100755
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
@@ -115,14 +115,13 @@ ubuntu_user_pass=$(openssl rand -hex 12)
 
 cdrom_vmdk_f="${box_d}/${prefix}-configdrive.vmdk"
 
-
 # Create the user-data. This is totally insecure, but so is Vagrant. To
 # mitigate this insecurity, the vagrant instance is not accessible
 # except via local host.
 cat > ${seed_d}/user-data <<END
 #cloud-config
-chpasswd: { expire: False }
 password: ${ubuntu_user_pass}
+chpasswd: { expire: False }
 ssh_pwauth: True
 manage_etc_hosts: localhost
 END