Merge remote-tracking branch 'simpoir/lp1970795-jammy-ova-cdrom' into ubuntu/master

* simpoir/lp1970795-jammy-ova-cdrom:
  fix: VMware cdrom OVF import requires to be on IDE

debian/changelog

@@ -5,6 +5,13 @@ livecd-rootfs (2.766) kinetic; urgency=medium
 
  -- Thomas Bechtold <thomas.bechtold@canonical.com>  Tue, 28 Jun 2022 13:29:05 +0200
 
+livecd-rootfs (2.766) kinetic; 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@canonical.com>  Sat, 11 Jun 2022 13:11:30 -0400
+
 livecd-rootfs (2.765) kinetic; urgency=medium
 
   [ Michael Hudson-Doyle ]

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"/>