summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-01 10:38:35 -0300
committerRenato Botelho <renato@netgate.com>2015-09-01 10:38:35 -0300
commite74b64a1ae7dd9c430c64457bd3d06e7eae6e0c6 (patch)
tree0e62a1fc8fdc66927aba71a0b72cf53f158c3c1d /tools
parentc4968f42fc320c13f433e7a73054e8b449b7cfa5 (diff)
downloadpfsense-e74b64a1ae7dd9c430c64457bd3d06e7eae6e0c6.zip
pfsense-e74b64a1ae7dd9c430c64457bd3d06e7eae6e0c6.tar.gz
Rename OVA_FIRST_PART_SIZE to OVA_FIRST_PART_SIZE_IN_GB to match other similar variables
Diffstat (limited to 'tools')
-rw-r--r--tools/builder_common.sh4
-rw-r--r--tools/builder_defaults.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index f676558..6d0d401 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -381,7 +381,7 @@ print_flags() {
printf " Git Branch or Tag: %s\n" $GIT_REPO_BRANCH_OR_TAG
printf " MODULES_OVERRIDE: %s\n" $MODULES_OVERRIDE
printf " VMDK_DISK_CAPACITY_IN_GB: %s\n" $VMDK_DISK_CAPACITY_IN_GB
- printf " OVA_FIRST_PART_SIZE: %s\n" $OVA_FIRST_PART_SIZE
+ printf " OVA_FIRST_PART_SIZE_IN_GB: %s\n" $OVA_FIRST_PART_SIZE_IN_GB
printf " OVA_SWAP_PART_SIZE_IN_GB: %s\n" $OVA_SWAP_PART_SIZE_IN_GB
printf " OVFTEMPLATE: %s\n" $OVFTEMPLATE
printf " OVFVMDK: %s\n" $OVFVMDK
@@ -801,7 +801,7 @@ create_ova_image() {
makefs \
-B little \
-o label=${PRODUCT_NAME} \
- -s ${OVA_FIRST_PART_SIZE} \
+ -s ${OVA_FIRST_PART_SIZE_IN_GB}g \
${OVA_TMP}/${OVFUFS} \
${FINAL_CHROOT_DIR} 2>&1 >> ${LOGFILE}
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 94eeddb..cef1093 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -206,7 +206,7 @@ export OVFVMDK=${OVFVMDK:-"${PRODUCT_NAME}-disk1.vmdk"}
# 8 gigabyte on disk VMDK size
export VMDK_DISK_CAPACITY_IN_GB=${VMDK_DISK_CAPACITY_IN_GB:-"8"}
# first partition size (freebsd-ufs)
-export OVA_FIRST_PART_SIZE=${OVA_FIRST_PART_SIZE:-"6g"}
+export OVA_FIRST_PART_SIZE_IN_GB=${OVA_FIRST_PART_SIZE_IN_GB:-"6"}
# swap partition size (freebsd-swap)
export OVA_SWAP_PART_SIZE_IN_GB=${OVA_SWAP_PART_SIZE_IN_GB:-"2"}
# Calculate real swap size, removing 128 blocks (65536 bytes) beggining/loader
OpenPOWER on IntegriCloud