diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-27 11:23:11 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-27 11:23:11 -0300 |
| commit | 173fa93f6bd4a0b62ed877431acbb30c8abbd27e (patch) | |
| tree | 10cf11123b8d723065251e56b8ad850672b4d5e8 /tools | |
| parent | 4beba293debe7037b0412462968da47a32ad7e8e (diff) | |
| download | pfsense-173fa93f6bd4a0b62ed877431acbb30c8abbd27e.zip pfsense-173fa93f6bd4a0b62ed877431acbb30c8abbd27e.tar.gz | |
Move ovf template to templates/ovf, also rename variables accordingly
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/builder_common.sh | 16 | ||||
| -rw-r--r-- | tools/builder_defaults.sh | 2 | ||||
| -rw-r--r-- | tools/templates/ovf/pfSense.ovf (renamed from tools/conf/ovf/pfSense.ovf) | 0 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 21f0de0..514c06b 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -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 diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 3996c33..f1b780e 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -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 diff --git a/tools/conf/ovf/pfSense.ovf b/tools/templates/ovf/pfSense.ovf index aeb82d3..aeb82d3 100644 --- a/tools/conf/ovf/pfSense.ovf +++ b/tools/templates/ovf/pfSense.ovf |
