From ffab8ceac49795bda91b971b026aca18f84fbe63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chlo=C3=A9=20Smith?= <chloe.smith@canonical.com>
Date: Mon, 21 Jun 2021 21:29:47 +0100
Subject: [PATCH] Add a serial port to OVF template (LP: #1895104)

groovy hangs during boot on ESXi when the version is greater than
10. Adding a serial port by default fixes this specific bug - increasing
the HW version will be for another branch.

This is because more investigation is needed into whether it is possible to
increment ddb.virtualHWVersion without disrupting Oracle VirtualBox images.
---
 debian/changelog                              | 10 +++++++
 .../hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl  | 26 ++++++++++++-------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c7c35bd..a5ee770c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.727) UNRELEASED; urgency=medium
+
+  * (LP: #1895104) Image hangs during boot after deploying 
+    groovy-server-cloudimg-amd64.ova, and the upgrading the ESXi hardware 
+    version. Adding a serial port rectifies this - so this code change 
+    simply adds a serial port to the OVF template (so there is a serial port as
+    default). 
+
+ -- Chloé 'kajiya' Smith <chloe.smith@canonical.com>  Mon, 21 Jun 2021 21:27:36 +0100
+
 livecd-rootfs (2.726) impish; urgency=medium
 
   * Fix overriding of ExecStart in
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 7f0b85e0..77ecc93d 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
@@ -84,24 +84,32 @@
         <rasd:ResourceSubType>VirtualSCSI</rasd:ResourceSubType>
         <rasd:ResourceType>6</rasd:ResourceType>
       </Item>
+      <Item ovf:required="false">
+        <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
+        <rasd:ElementName>serial0</rasd:ElementName>
+        <rasd:InstanceID>4</rasd:InstanceID>
+        <rasd:ResourceSubType>vmware.serialport.device</rasd:ResourceSubType>
+        <rasd:ResourceType>21</rasd:ResourceType>
+        <vmw:Config ovf:required="false" vmw:key="yieldOnPoll" vmw:value="false" />
+      </Item>
       <Item>
         <rasd:Address>1</rasd:Address>
         <rasd:Description>IDE Controller</rasd:Description>
         <rasd:ElementName>VirtualIDEController 1</rasd:ElementName>
-        <rasd:InstanceID>4</rasd:InstanceID>
+        <rasd:InstanceID>5</rasd:InstanceID>
         <rasd:ResourceType>5</rasd:ResourceType>
       </Item>
       <Item>
         <rasd:Address>0</rasd:Address>
         <rasd:Description>IDE Controller</rasd:Description>
         <rasd:ElementName>VirtualIDEController 0</rasd:ElementName>
-        <rasd:InstanceID>5</rasd:InstanceID>
+        <rasd:InstanceID>6</rasd:InstanceID>
         <rasd:ResourceType>5</rasd:ResourceType>
       </Item>
       <Item ovf:required="false">
         <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
         <rasd:ElementName>VirtualVideoCard</rasd:ElementName>
-        <rasd:InstanceID>6</rasd:InstanceID>
+        <rasd:InstanceID>7</rasd:InstanceID>
         <rasd:ResourceType>24</rasd:ResourceType>
         <vmw:Config ovf:required="false" vmw:key="enable3DSupport" vmw:value="false"/>
         <vmw:Config ovf:required="false" vmw:key="enableMPTSupport" vmw:value="false"/>
@@ -112,7 +120,7 @@
       <Item ovf:required="false">
         <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
         <rasd:ElementName>VirtualVMCIDevice</rasd:ElementName>
-        <rasd:InstanceID>7</rasd:InstanceID>
+        <rasd:InstanceID>8</rasd:InstanceID>
         <rasd:ResourceSubType>vmware.vmci</rasd:ResourceSubType>
         <rasd:ResourceType>1</rasd:ResourceType>
         <vmw:Config ovf:required="false" vmw:key="allowUnrestrictedCommunication" vmw:value="false"/>
@@ -121,8 +129,8 @@
         <rasd:AddressOnParent>0</rasd:AddressOnParent>
         <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
         <rasd:ElementName>CD-ROM 1</rasd:ElementName>
-        <rasd:InstanceID>8</rasd:InstanceID>
-        <rasd:Parent>4</rasd:Parent>
+        <rasd:InstanceID>9</rasd:InstanceID>
+        <rasd:Parent>3</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"/>
@@ -131,7 +139,7 @@
         <rasd:AddressOnParent>0</rasd:AddressOnParent>
         <rasd:ElementName>Hard Disk 1</rasd:ElementName>
         <rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
-        <rasd:InstanceID>9</rasd:InstanceID>
+        <rasd:InstanceID>10</rasd:InstanceID>
         <rasd:Parent>3</rasd:Parent>
         <rasd:ResourceType>17</rasd:ResourceType>
         <vmw:Config ovf:required="false" vmw:key="backing.writeThrough" vmw:value="false"/>
@@ -141,7 +149,7 @@
         <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
         <rasd:Description>Floppy Drive</rasd:Description>
         <rasd:ElementName>Floppy 1</rasd:ElementName>
-        <rasd:InstanceID>10</rasd:InstanceID>
+        <rasd:InstanceID>11</rasd:InstanceID>
         <rasd:ResourceSubType>vmware.floppy.remotedevice</rasd:ResourceSubType>
         <rasd:ResourceType>14</rasd:ResourceType>
       </Item>
@@ -151,7 +159,7 @@
         <rasd:Connection>VM Network</rasd:Connection>
         <rasd:Description>VmxNet3 ethernet adapter on &quot;VM Network&quot;</rasd:Description>
         <rasd:ElementName>Ethernet 1</rasd:ElementName>
-        <rasd:InstanceID>11</rasd:InstanceID>
+        <rasd:InstanceID>12</rasd:InstanceID>
         <rasd:ResourceSubType>VmxNet3</rasd:ResourceSubType>
         <rasd:ResourceType>10</rasd:ResourceType>
         <vmw:Config ovf:required="false" vmw:key="wakeOnLanEnabled" vmw:value="true"/>