[neon/neon/livecd-rootfs/Neon/release] /: fix: VMware cdrom OVF import requires to be on IDE

[Thomas Bechtold]

Git commit 8eb4f2d447e7a9877824d92f22326182a0cd958e by Thomas Bechtold, on behalf of Simon Poirier.
Committed on 29/06/2022 at 10:53.
Pushed by jriddell into branch 'Neon/release'.

fix: VMware cdrom OVF import requires to be on IDE

This reverts part of a change causing regression with vmware import due to the
cdrom getting moved to SCSI while shifting controller IDs. (LP: #1970795)

(cherry picked from commit 3da8e81bf27f3770f3664a332d8767fa62fd4771)

Conflicts:
        debian/changelog

Conflict solved by copying the debian/changelog entry from the archive.

M  +7    -0    debian/changelog
M  +1    -1    live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl

https://invent.kde.org/neon/neon/livecd-rootfs/commit/8eb4f2d447e7a9877824d92f22326182a0cd958e

diff --git a/debian/changelog b/debian/changelog
index e4b6c681..008f9370 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.764.1) jammy; urgency=medium
+
+  * live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl:
+    Revert OVF cd-rom controller to be IDE for VMWare (LP: #1970795)
+
+ -- Simon Poirier <simon.poirier at canonical.com>  Thu, 16 Jun 2022 19:34:03 -0400
+
 livecd-rootfs (2.764) jammy; urgency=medium
 
   [ Michał Sawicz ]
diff --git a/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl b/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl
index b15d73e5..af2d0c18 100644
--- a/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl
+++ b/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl
@@ -130,7 +130,7 @@
         <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
         <rasd:ElementName>CD-ROM 1</rasd:ElementName>
         <rasd:InstanceID>9</rasd:InstanceID>
-        <rasd:Parent>3</rasd:Parent>
+        <rasd:Parent>5</rasd:Parent>
         <rasd:ResourceSubType>vmware.cdrom.remotepassthrough</rasd:ResourceSubType>
         <rasd:ResourceType>15</rasd:ResourceType>
         <vmw:Config ovf:required="false" vmw:key="backing.exclusive" vmw:value="false"/>