[Merge] ~kajiya/livecd-rootfs:kajiya-lp-1895104-add-serial-port-to-ovf into livecd-rootfs:ubuntu/master

[Thomas Bechtold]

Review: Needs Fixing



Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index 8bda577..94ffb30 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,14 @@
> +livecd-rootfs (2.725ubuntu1) UNRELEASED; urgency=medium

version is wrong. should be 2.726

> +
> +  * (bug #LP1895104) Image hangs during boot after deploying 

I think the format for a bug is (LP: #1895104). See other entries in debian/changelog for examples.

> +    groovy-server-cloudimg-amd64.ova and the upgrading the ESXi hardware version.
> +    Adding a serial port rectifies this - so this code change adds a serial port
> +    to the OVF template. There was also a request to upgrade the default ESXi version,

the debian/changelog entries are visible to endusers. I don't think they want to know about the request for upgrading the ESXi version. See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#writing-useful-changelog-entries

> +    but futher investigation is needed to ascertain if that will affect VirtualBox
> +    (as the code producing OVAs is the same for both platforms)  
> +
> + -- Chloé <kajiya at chloe-HAL> <chloe.smith at canonical.com> Wed, 16 Jun 2021 20:06:41 +0100

please drop <kajiya at chloe-HAL> .

> +
>  livecd-rootfs (2.725) impish; urgency=medium
>  
>    * Revert previous change. I was too impatient and didn't wait long enough
> 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 7f0b85e..19c6917 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>

could we just use 12 here and not change all the other InstanceIDs then?

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


-- 
https://code.launchpad.net/~kajiya/livecd-rootfs/+git/livecd-rootfs/+merge/404339
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~kajiya/livecd-rootfs:kajiya-lp-1895104-add-serial-port-to-ovf into livecd-rootfs:ubuntu/master.