From 0a8a704b0b820d6c0f8bcbdbca6c6237424358a8 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Thu, 9 Jun 2016 10:47:25 +0100
Subject: [PATCH] Remove '-disk1' from bootable image names.

---
 debian/changelog                                      | 1 +
 live-build/ubuntu-cpc/hooks/040-qcow2-image.binary    | 2 +-
 live-build/ubuntu-cpc/hooks/040-vmdk-image.binary     | 8 +-------
 live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary | 4 ++--
 live-build/ubuntu-cpc/hooks/042-vagrant.binary        | 2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c8c0e95..d95d8ddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ livecd-rootfs (2.416) UNRELEASED; urgency=medium
     - Remove .tar.gz and .tar.xz (removed in favour of the squashfs).
     - Remove the MBR-only disk image in favour of the shared GPT/MBR UEFI
       image.
+    - Remove '-disk1' from bootable image names.
 
  -- Daniel Watkins <daniel.watkins@canonical.com>  Thu, 09 Jun 2016 10:34:13 +0100
 
diff --git a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
index 8281b365..6cdda432 100755
--- a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
+++ b/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
@@ -15,5 +15,5 @@ apt-get install -qqy qemu-utils
 . /build/config/functions
 
 if [ -f binary/boot/disk-uefi.ext4 ]; then
-    convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.disk1.img
+    convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.img
 fi
diff --git a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary
index 80e4142c..8454f829 100755
--- a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary
+++ b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary
@@ -3,8 +3,6 @@
 #
 # Generate VMDK files
 
-extension="disk1.vmdk"
-
 case $ARCH in
          i386|amd64) ;;
                   *) echo "VMDK images are not supported for $ARCH yet.";
@@ -13,10 +11,6 @@ esac
 
 . /build/config/functions
 
-if [ -e binary/boot/disk.ext4 ]; then
-    create_vmdk binary/boot/disk.ext4 livecd.ubuntu-cpc.disk1.vmdk
-fi
-
 if [ -e binary/boot/disk-uefi.ext4 ]; then
-    create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.uefi.vmdk
+    create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.vmdk
 fi
diff --git a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
index c48ca75b..defb74df 100755
--- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
+++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
@@ -17,9 +17,9 @@ esac
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))
 
-base_vmdk="livecd.ubuntu-cpc.disk1.vmdk"
+base_vmdk="livecd.ubuntu-cpc.vmdk"
 if [ "$ARCH" = "amd64" ]; then
-    base_vmdk="livecd.ubuntu-cpc.uefi.vmdk"
+    base_vmdk="livecd.ubuntu-cpc.vmdk"
 fi
 
 if [ ! -e ${base_vmdk} ]; then
diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
index bb9f8db1..a784aa21 100755
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
@@ -15,7 +15,7 @@
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))
 
-base_vmdk="livecd.ubuntu-cpc.disk1.vmdk"
+base_vmdk="livecd.ubuntu-cpc.vmdk"
 
 case $ARCH in
 	amd64|i386) ;;