summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-03-15 21:30:58 -0300
committerRenato Botelho <renato@netgate.com>2016-03-15 21:30:58 -0300
commitf2d83cfb7ce445d4df1370030350010a47c33473 (patch)
treea6b453ffc3c778e21269eb898b0d966261e8ebef
parented44fe761d53f41afbc7b33c95fe04af27c3441d (diff)
downloadpfsense-f2d83cfb7ce445d4df1370030350010a47c33473.zip
pfsense-f2d83cfb7ce445d4df1370030350010a47c33473.tar.gz
Add product_name suffix to ova/ovf
-rw-r--r--tools/builder_common.sh1
-rw-r--r--tools/builder_defaults.sh6
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index b3fc718..c0cb68d 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -985,6 +985,7 @@ ova_setup_ovf_template() {
-e "s,%%OS_TYPE%%,${_os_type},g" \
-e "s,%%OS_DESCR%%,${_os_descr},g" \
-e "s,%%PRODUCT_NAME%%,${PRODUCT_NAME},g" \
+ -e "s,%%PRODUCT_NAME_SUFFIX%%,${PRODUCT_NAME_SUFFIX},g" \
-e "s,%%PRODUCT_VERSION%%,${PRODUCT_VERSION},g" \
-e "s,%%PRODUCT_URL%%,${PRODUCT_URL},g" \
-e "/^%%PRODUCT_LICENSE%%/r ${BUILDER_ROOT}/license.txt" \
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 0b47198..925ae30 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -203,11 +203,11 @@ export MEMORYDISK_SIZE=${MEMORYDISK_SIZE:-"1024M"}
# Name of ovf file included inside OVA archive
export OVFTEMPLATE=${OVFTEMPLATE:-"${BUILDER_TOOLS}/templates/ovf/${PRODUCT_NAME}.ovf"}
# / partition to be used by mkimg
-export OVFUFS=${OVFUFS:-"${PRODUCT_NAME}-disk1.ufs"}
+export OVFUFS=${OVFUFS:-"${PRODUCT_NAME}${PRODUCT_NAME_SUFFIX}-disk1.ufs"}
# Raw disk to be converted to vmdk
-export OVFRAW=${OVFRAW:-"${PRODUCT_NAME}-disk1.raw"}
+export OVFRAW=${OVFRAW:-"${PRODUCT_NAME}${PRODUCT_NAME_SUFFIX}-disk1.raw"}
# On disk name of VMDK file included in OVA
-export OVFVMDK=${OVFVMDK:-"${PRODUCT_NAME}-disk1.vmdk"}
+export OVFVMDK=${OVFVMDK:-"${PRODUCT_NAME}${PRODUCT_NAME_SUFFIX}-disk1.vmdk"}
# 8 gigabyte on disk VMDK size
export VMDK_DISK_CAPACITY_IN_GB=${VMDK_DISK_CAPACITY_IN_GB:-"8"}
# swap partition size (freebsd-swap)
OpenPOWER on IntegriCloud