diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-27 11:33:31 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-27 18:31:18 -0300 |
| commit | b63312700f52d1dc4c1ebb9cb2b8b8a1e19ef833 (patch) | |
| tree | 8543dfcc9a9dfeba1a6204953525da1176e6c979 | |
| parent | 5c874ea5fbd41bd7af68d8b5f979affd4ac2f59d (diff) | |
| download | pfsense-b63312700f52d1dc4c1ebb9cb2b8b8a1e19ef833.zip pfsense-b63312700f52d1dc4c1ebb9cb2b8b8a1e19ef833.tar.gz | |
Remove unnecessary variables, also add some error checking
| -rw-r--r-- | tools/builder_common.sh | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 5ef36d8..0fba48f 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -905,12 +905,25 @@ ova_calculate_mnt_size() { # called from create_ova_image ova_create_raw_backed_file() { - DISKSIZE=$OVADISKSIZE - BLOCKSIZE=$OVABLOCKSIZE - COUNT=$((${DISKSIZE}/${BLOCKSIZE})) - DISKFILE=${IMAGES_FINAL_DIR}/${OVFVMDK}.raw - echo ">>> Creating raw backing file ${DISKFILE} (Disk Size: ${DISKSIZE}, Block Size: ${BLOCKSIZE}, Count: ${COUNT})..." | tee -a ${LOGFILE} - dd if=/dev/zero of=$DISKFILE bs=$BLOCKSIZE count=0 seek=$COUNT + if [ -z "${OVADISKSIZE}" ]; then + echo ">>> ERROR: OVADISKSIZE is not defined" + print_error_pfS + fi + + if [ -z "${OVABLOCKSIZE}" ]; then + echo ">>> ERROR: OVABLOCKSIZE is not defined" + print_error_pfS + fi + + if [ -z "${OVFVMDK}" ]; then + echo ">>> ERROR: OVFVMDK is not defined" + print_error_pfS + fi + + local COUNT=$((${OVADISKSIZE}/${OVABLOCKSIZE})) + local DISKFILE=${IMAGES_FINAL_DIR}/${OVFVMDK}.raw + echo ">>> Creating raw backing file ${DISKFILE} (Disk Size: ${OVADISKSIZE}, Block Size: ${OVABLOCKSIZE}, Count: ${COUNT})..." | tee -a ${LOGFILE} + dd if=/dev/zero of=$DISKFILE bs=$OVABLOCKSIZE count=0 seek=$COUNT } # called from create_ova_image |
