Add more parameters to ovf

3 files changed, 17 insertions, 7 deletions

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index c0cb68d..c939be8 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -988,6 +988,8 @@ ova_setup_ovf_template() {
 		-e "s,%%PRODUCT_NAME_SUFFIX%%,${PRODUCT_NAME_SUFFIX},g" \
 		-e "s,%%PRODUCT_VERSION%%,${PRODUCT_VERSION},g" \
 		-e "s,%%PRODUCT_URL%%,${PRODUCT_URL},g" \
+		-e "s,%%VENDOR_NAME%%,${VENDOR_NAME},g" \
+		-e "s,%%OVF_INFO%%,${OVF_INFO},g" \
 		-e "/^%%PRODUCT_LICENSE%%/r ${BUILDER_ROOT}/license.txt" \
 		-e "/^%%PRODUCT_LICENSE%%/d" \
 		${OVFTEMPLATE} > ${OVA_TMP}/${PRODUCT_NAME}.ovf
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 925ae30..068c07a 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -362,3 +362,11 @@ else
 	export SNAPSHOTS_RSYNCUSER=${RSYNCUSER}
 	export SNAPSHOTS_RSYNCLOGS=${RSYNCLOGS}
 fi
+
+if [ "${PRODUCT_NAME}" = "pfSense" ]; then
+	export VENDOR_NAME=${VENDOR_NAME:-"Electric Sheep Fencing, LLC"}
+	export OVF_INFO=${OVF_INFO:-"pfSense is a free, open source customized distribution of FreeBSD tailored for use as a firewall and router. In addition to being a powerful, flexible firewalling and routing platform, it includes a long list of related features and a package system allowing further expandability without adding bloat and potential security vulnerabilities to the base distribution. pfSense is a popular project with more than 1 million downloads since its inception, and proven in countless installations ranging from small home networks protecting a PC and an Xbox to large corporations, universities and other organizations protecting thousands of network devices."}
+else
+	export VENDOR_NAME=${VENDOR_NAME:-"nonSense"}
+	export OVF_INFO=${OVF_INFO:-"none"}
+fi
diff --git a/tools/templates/ovf/pfSense.ovf b/tools/templates/ovf/pfSense.ovf
index 1e8b9b7..76ade4c 100644
--- a/tools/templates/ovf/pfSense.ovf
+++ b/tools/templates/ovf/pfSense.ovf
@@ -2,7 +2,7 @@
 <!--Generated by VMware VirtualCenter Server, User: root, UTC time: 2015-07-28T05:27:27.755385Z-->
 <Envelope vmw:buildId="build-2646482" xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <References>
-    <File ovf:href="pfSense-disk1.vmdk" ovf:id="file1" ovf:size="%%VMDK_FILE_SIZE%%" />
+    <File ovf:href="%%PRODUCT_NAME%%%%PRODUCT_NAME_SUFFIX%%-disk1.vmdk" ovf:id="file1" ovf:size="%%VMDK_FILE_SIZE%%" />
   </References>
   <DiskSection>
     <Info>Virtual disk information</Info>
@@ -17,9 +17,9 @@
       <Description>The LAN network</Description>
     </Network>
   </NetworkSection>
-  <VirtualSystem ovf:id="pfSense">
+  <VirtualSystem ovf:id="%%PRODUCT_NAME%%%%PRODUCT_NAME_SUFFIX%%">
     <Info>A virtual machine</Info>
-    <Name>pfSense</Name>
+    <Name>%%PRODUCT_NAME%%%%PRODUCT_NAME_SUFFIX%%</Name>
     <OperatingSystemSection ovf:id="%%OS_ID%%" vmw:osType="%%OS_TYPE%%">
       <Info>The kind of installed guest operating system</Info>
       <Description>%%OS_DESCR%%</Description>
@@ -29,7 +29,7 @@
       <System>
         <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
         <vssd:InstanceID>0</vssd:InstanceID>
-        <vssd:VirtualSystemIdentifier>pfSense</vssd:VirtualSystemIdentifier>
+        <vssd:VirtualSystemIdentifier>%%PRODUCT_NAME%%%%PRODUCT_NAME_SUFFIX%%</vssd:VirtualSystemIdentifier>
         <vssd:VirtualSystemType>vmx-08</vssd:VirtualSystemType>
       </System>
       <Item>
@@ -153,15 +153,15 @@
     </VirtualHardwareSection>
     <ProductSection xsi:type="ovf:ProductSection_Type">
       <Info>Describes product information for the service</Info>
-      <Product>pfSense</Product>
-      <Vendor>Electric Sheep Fencing, LLC</Vendor>
+      <Product>%%PRODUCT_NAME%%%%PRODUCT_NAME_SUFFIX%%</Product>
+      <Vendor>%%VENDOR_NAME%%</Vendor>
       <Version>%%PRODUCT_VERSION%%</Version>
       <ProductUrl>%%PRODUCT_URL%%</ProductUrl>
       <VendorUrl>%%PRODUCT_URL%%</VendorUrl>
     </ProductSection>
     <AnnotationSection ovf:required="false">
       <Info>A human-readable annotation</Info>
-      <Annotation>pfSense is a free, open source customized distribution of FreeBSD tailored for use as a firewall and router. In addition to being a powerful, flexible firewalling and routing platform, it includes a long list of related features and a package system allowing further expandability without adding bloat and potential security vulnerabilities to the base distribution. pfSense is a popular project with more than 1 million downloads since its inception, and proven in countless installations ranging from small home networks protecting a PC and an Xbox to large corporations, universities and other organizations protecting thousands of network devices.</Annotation>
+      <Annotation>%%OVF_INFO%%</Annotation>
     </AnnotationSection>
     <EulaSection>
       <Info>The End User License Agreement</Info>