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

[Chloé Smith]

Diff comments:

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

Unfortunately not - the serial port needs to before the virtual disk. In all honesty I am not sure what the conventional order is, but when I added the serial port at the end (as instance 12 in this case) it didn't build, but when I added it just after the SCSI it did :)

> +        <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.