build system: use DISK_SIZE in bytes for ovf template

This commit is contained in:
zalaare 2017-08-14 15:51:53 -04:00
parent d49ec62db6
commit e8fe8b4360
2 changed files with 2 additions and 2 deletions

View File

@ -6,7 +6,7 @@ xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemS
</References>
<DiskSection>
<Info>Virtual disk information</Info>
<Disk ovf:capacity="548" ovf:capacityAllocationUnits="byte * 2^20" ovf:diskId="disk" ovf:fileRef="file" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized"/>
<Disk ovf:capacity="@DISK_SIZE@" ovf:diskId="disk" ovf:fileRef="file" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized"/>
</DiskSection>
<NetworkSection>
<Info>The list of logical networks</Info>

View File

@ -295,7 +295,7 @@ fi # bootloader
if [ "$PROJECT" = "Generic" ]; then
echo "image: creating open virtual appliance..."
qemu-img convert -O vmdk -o subformat=streamOptimized "$DISK" "$DISK.vmdk"
sed -e "s,@DISTRO@,$DISTRO,g" -e "s,@DISK@,$(basename $DISK),g" -e "s,@DISK_SIZE@,$(ls -l $DISK.vmdk | awk '{print $5}'),g" $PROJECT_DIR/$PROJECT/config/ovf.template > $DISK.ovf
sed -e "s,@DISTRO@,$DISTRO,g" -e "s,@DISK@,$(basename $DISK),g" -e "s,@DISK_SIZE@,$(($DISK_SIZE*1024*1024)),g" $PROJECT_DIR/$PROJECT/config/ovf.template > $DISK.ovf
tar -C $TARGET_IMG -cf $DISK.ova $(basename $DISK).ovf $(basename $DISK).vmdk
echo "image: cleaning up..."
rm $DISK.vmdk $DISK.ovf