mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ovf template to templates/ovf, also rename variables accordingly

Browse Source
This commit is contained in:
Renato Botelho 2015-08-27 11:23:11 -03:00
parent 4beba293de
commit 173fa93f6b
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/builder_common.sh
View File

@ -384,7 +384,7 @@ print_flags() {
printf " OVABLOCKSIZE: %s\n" $OVABLOCKSIZE
printf " OVA_FIRST_PART_SIZE: %s\n" $OVA_FIRST_PART_SIZE
printf " OVA_SWAP_PART_SIZE: %s\n" $OVA_SWAP_PART_SIZE
printf " OVFFILE: %s\n" $OVFFILE
printf " OVFTEMPLATE: %s\n" $OVFTEMPLATE
printf " OVFVMDK: %s\n" $OVFVMDK
printf " OVFCERT: %s\n" $OVFCERT
printf " SRC_CONF: %s\n" $SRC_CONF
@ -875,15 +875,15 @@ ova_mount_mnt() {
# called from create_ova_image
ova_setup_ovf_file() {
if [ -f ${OVFFILE} ]; then
cp ${OVFFILE} ${IMAGES_FINAL_DIR}/${PRODUCT_NAME}.ovf
if [ -f ${OVFTEMPLATE} ]; then
cp ${OVFTEMPLATE} ${IMAGES_FINAL_DIR}/${PRODUCT_NAME}.ovf
else
echo ">>> ERROR: OVF template file (${OVFTEMPLATE}) not found."
print_error_pfS
fi
if [ ! -f ${IMAGES_FINAL_DIR}/${PRODUCT_NAME}.ovf ]; then
cp ${BUILDER_TOOLS}/conf/ovf/${PRODUCT_NAME}.ovf ${IMAGES_FINAL_DIR}/${PRODUCT_NAME}.ovf
file_search_replace PRODUCT_VERSION $PRODUCT_VERSION ${IMAGES_FINAL_DIR}/${PRODUCT_NAME}.ovf
file_search_replace PRODUCT_URL $PRODUCT_URL ${IMAGES_FINAL_DIR}/${PRODUCT_NAME}.ovf
fi
file_search_replace PRODUCT_VERSION $PRODUCT_VERSION ${IMAGES_FINAL_DIR}/${PRODUCT_NAME}.ovf
file_search_replace PRODUCT_URL $PRODUCT_URL ${IMAGES_FINAL_DIR}/${PRODUCT_NAME}.ovf
}
# called from create_ova_image

2
tools/builder_defaults.sh
View File

@ -193,7 +193,7 @@ export MEMORYDISK_SIZE=${MEMORYDISK_SIZE:-"768M"}
# OVF/vmdk parms
# Name of ovf file included inside OVA archive
export OVFFILE=${OVFFILE:-"${PRODUCT_NAME}.ovf"}
export OVFTEMPLATE=${OVFTEMPLATE:-"${BUILDER_TOOLS}/templates/ovf/${PRODUCT_NAME}.ovf"}
# On disk name of VMDK file included in OVA
export OVFVMDK=${OVFVMDK:-"${PRODUCT_NAME}.vmdk"}
# optional

0
tools/conf/ovf/pfSense.ovf → tools/templates/ovf/pfSense.ovf
View File